]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:46:07 +0000 (12:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:46:07 +0000 (12:46 +1000)
Conflicts:
Documentation/feature-removal-schedule.txt


Trivial merge