summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-19 12:46:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-19 12:46:32 -0700
commit97ddec65ff85a3226fb2856b4d93ebbcf097c28f (patch)
treef8ee80325815e05caf66a9afd09817ab1d447acd /net
parent9d914b3ef38d996aa6b369267fd2975e7efa92d6 (diff)
parent8a226e00eeed8db843d4a580013a49ae3559bcd7 (diff)
downloadop-kernel-dev-97ddec65ff85a3226fb2856b4d93ebbcf097c28f.zip
op-kernel-dev-97ddec65ff85a3226fb2856b4d93ebbcf097c28f.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud