]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 03:25:48 +0000 (14:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 03:25:48 +0000 (14:25 +1100)
commit1bb50f5d780189cdb245dbabae886081c9dd441e
treedd86f82188d1727fe5ce1f13f063306f2044aaf4
parent0cc0f64b2687a06f110d4907cf0b582dee972d67
parent114d6e9c103736487c967060d0a7aec9a7fce967
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile