Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 00:43:04 +0000 (17:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 00:43:04 +0000 (17:43 -0700)
commit31583d6acf940d2951bc8716557b06d9de5a0c4b
tree607aef385b0998f0cb7ff63b05407afed5182840
parentee37ba7a4212c7420f12e6a2ad8a3966649ede7a
parentf740f5ca056f0a4eff3abdf272a8a4ba3965d57d
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
fs/ext4/super.c