git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bd1a68b
69964ea
)
Merge tag 'v3.4-rc5' into for-3.5/core
author
Jens Axboe
<axboe@kernel.dk>
Tue, 1 May 2012 12:29:55 +0000
(14:29 +0200)
committer
Jens Axboe
<axboe@kernel.dk>
Tue, 1 May 2012 12:29:55 +0000
(14:29 +0200)
The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.
Linux 3.4-rc5
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Trivial merge