git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d914b3 8a226e0)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2011 19:46:32 +0000 (12:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2011 19:46:32 +0000 (12:46 -0700)
* '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


Trivial merge
Pandora Kernel Repository