]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)
commit2230164bf900513b108885464c2444315073fe4d
treeae0d6752fab5cd3da98aa6519ea5f146da1894c1
parent5b9b2a99d320d2bed2371c02a1ac64afc3f38cc7
parent735e93c70434614bffac4a914ca1da72e37d43c0
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile