]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:24:43 +0000 (14:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:24:43 +0000 (14:24 +1100)
commit6366d8c082416d275c04e85db2378fc2e9a28ce0
tree02999f9d780270cd710c17d6715d4f478b07216f
parentf3e73dd47dcc242f91af7848fc3cbe36d5ef81b1
parent114d6e9c103736487c967060d0a7aec9a7fce967
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile