diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-24 11:58:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-24 11:58:53 -0400 |
| commit | 0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (patch) | |
| tree | 777358b8bb7c474567edac1c7c958a604fdb65b9 /drivers/watchdog/lantiq_wdt.c | |
| parent | d4c2456a1888d7914502f4237b2ca4e262dd4c4d (diff) | |
| parent | e97e548ba8baffe051146d1f5e897dec48da20e0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull gfs2 fixes from Steven Whitehouse:
"This time there are just four fixes. There are a couple of minor
updates to the quota code, a fix for KConfig to ensure that only valid
combinations including GFS2 can be built, and a fix for a typo
affecting end i/o processing when writing the journal.
Also, there is a temporary fix for a performance regression relating
to block reservations and directories. A longer fix will be applied
in due course, but this deals with the most immediate problem for now"
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
GFS2: Fix typo in gfs2_log_end_write loop
GFS2: fix DLM depends to fix build errors
GFS2: Use single-block reservations for directories
GFS2: two minor quota fixups
Diffstat (limited to 'drivers/watchdog/lantiq_wdt.c')
0 files changed, 0 insertions, 0 deletions