]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 02:13:09 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 02:13:09 +0000 (13:13 +1100)
commitecd045516f5692b5a8f3647979739c4fd36178d0
tree5832963c77ebceaf1b69f7e5bdae5b521414bd6d
parent7af705a57df85afcbafd12b36c8a02d3edc0eb4a
parent2053c4727c5a891bf182397e425b6cb87b2ae613
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile