From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Jun 2009 00:43:04 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=31583d6acf940d2951bc8716557b06d9de5a0c4b;p=openwrt%2Fstaging%2Fblogic.git

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
---

31583d6acf940d2951bc8716557b06d9de5a0c4b