]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:48:32 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:48:32 +0000 (16:48 -0700)
commitdf930d7fc498294e6339321a031fb890bf958131
treee0c415aa911136293d50e0116bafdc5128bd4080
parent5a2ddbcd9b019e3d07e1c28a52d4f79d5619a8a9
parent6d3281158fc8dc043ac40ba5b7c68655970b4a4e
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-cd: fix REQ_QUIET tests in cdrom_decode_status

Fix up trivial conflicts in include/linux/blkdev.h
include/linux/blkdev.h