]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.7/core' into for-3.7/drivers
authorJens Axboe <axboe@kernel.dk>
Thu, 27 Sep 2012 10:46:00 +0000 (12:46 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 27 Sep 2012 10:46:00 +0000 (12:46 +0200)
We need the SG number-of-entries patch for the memory stick
block support.


Trivial merge