diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-10 16:20:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-10 16:20:00 -0700 |
commit | 573c577af079184ca523984e3279644eb37756a3 (patch) | |
tree | 7e9da3f937733592032ca6ef6ff95773ab991010 /block/blk-merge.c | |
parent | 0cdf5a464070c8a2980a27113c47fb8e71babb9c (diff) | |
parent | b14132797d8041a42e03f4ffa1e722da1425adfb (diff) | |
download | blackbird-op-linux-573c577af079184ca523984e3279644eb37756a3.tar.gz blackbird-op-linux-573c577af079184ca523984e3279644eb37756a3.zip |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek.
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
elf-em.h: move EM_MICROBLAZE to the common header
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions