| commit | 7b39da786a63e82d9d440075eae9018b79154d2a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 02 16:48:32 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat May 02 16:48:32 2009 -0700 |
| tree | e0c415aa911136293d50e0116bafdc5128bd4080 | |
| parent | 2142babac999a5ba169348892a8e3ac222bec7a4 [diff] | |
| parent | 96c16743973e8c1a7b9c655d10b7973408d6d1dd [diff] |
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