]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 01:16:02 +0000 (12:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 01:16:02 +0000 (12:16 +1100)
commit04ee236ec2fd5adf26caa80198de7552e15abe51
tree74edb041026c81a1d19673fd121c199dea53a173
parent0aaf665fd6bdb797dc00ac218aa35eb8fac13575
parentde353533753e048b5c4658f0a42365937527ac45
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile