diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 02:43:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 02:43:04 +0200 |
| commit | 31583d6acf940d2951bc8716557b06d9de5a0c4b (patch) | |
| tree | 607aef385b0998f0cb7ff63b05407afed5182840 /fs/autofs4 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 (diff) | |
| parent | Fix kernel-doc parameter name typo in blk-settings.c: (diff) | |
| download | linux-31583d6acf940d2951bc8716557b06d9de5a0c4b.tar.xz linux-31583d6acf940d2951bc8716557b06d9de5a0c4b.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Fix kernel-doc parameter name typo in blk-settings.c:
block: rename CONFIG_LBD to CONFIG_LBDAF
block: Fix bounce_pfn setting
hd: stop defining MAJOR_NR
Diffstat (limited to 'fs/autofs4')
0 files changed, 0 insertions, 0 deletions