From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Apr 2011 19:46:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: upstream/snapshot3+hdmi~10603
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97ddec65ff85a3226fb2856b4d93ebbcf097c28f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by allmodconfig
---

97ddec65ff85a3226fb2856b4d93ebbcf097c28f