| commit | 7b39da786a63e82d9d440075eae9018b79154d2a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 2 May 2009 23:48:32 +0000 (2 16:48 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 2 May 2009 23:48:32 +0000 (2 16:48 -0700) | ||
| tree | e0c415aa911136293d50e0116bafdc5128bd4080 | treesnapshot (tar.gz zip) |
| parent | 2142babac999a5ba169348892a8e3ac222bec7a4 | commitdiff |
| parent | 96c16743973e8c1a7b9c655d10b7973408d6d1dd | commitdiff |
Merge branch 'for-linus' of git://git./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
* '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 | diff1 | diff2 | blobhistory |