]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 02:36:28 +0000 (13:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 02:36:28 +0000 (13:36 +1100)
commitb816f6aa8f9f81f89abcdb0a9182098624954f37
treee4925d1b1f3bc53675fc63ee67857e1b7320a27a
parent2f41bd7cda8ac4287e342c571391c7447b52f46f
parentde353533753e048b5c4658f0a42365937527ac45
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile