]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 02:19:29 +0000 (13:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 02:19:29 +0000 (13:19 +1100)
commit2225e211161d49440ae97093c4bfa4b6c12a9719
treee7ff39a6f25dcd1583d62a8bc8bdac4d0657f030
parenta53094d77509def24e3eaa531bea1126f0cc5bd5
parentde353533753e048b5c4658f0a42365937527ac45
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile