git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
018a17b
a516440
)
Merge branch 'for-linus' into for-3.18/core
author
Jens Axboe
<axboe@fb.com>
Thu, 11 Sep 2014 15:31:18 +0000
(09:31 -0600)
committer
Jens Axboe
<axboe@fb.com>
Thu, 11 Sep 2014 15:31:18 +0000
(09:31 -0600)
A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/scsi_ioctl.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff