]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:47:14 +0000 (14:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:47:14 +0000 (14:47 +1100)
commit3202ef0629c6903960d0153b89632da8287ff25e
tree5564a5f293be15210f23c29e2da38b5201cbe1ef
parent90ed91ac6d62330427107fbee1a08fa8f1ee1d47
parentb8aa09fd880eb4c2881b9f3c8a8d09c0404cd4eb
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile