summaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-19 15:49:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-19 15:49:31 -0800
commite87e7be92979480ee5a2d4a746dc88f2eeca79ca (patch)
treee30366e742d61bdeb2ad5ba13859b14480213224 /block/blk-merge.c
parentdec8e46178bad9f1717a948572d76e0f804be801 (diff)
parent24b9fdc59ac365e7e313e5af44c7bfe31c15c774 (diff)
Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 fix from Tony Luck: "Unbreak ia64 build by avoiding circular dependency" * tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: kernel/bounds: avoid circular dependencies in generated headers
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions