Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Sat, 20 Jun 2009 00:43:04 +0000 (17:43 -0700)]
* '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

1  2 
fs/ext4/super.c

diff --cc fs/ext4/super.c
Simple merge