| commit | 1a3f2ea336b784d7df750a7821f514f3dea69e29 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Aug 03 14:58:08 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Aug 03 14:58:08 2007 -0700 |
| tree | b7c2f5c7cc841d9f7b38fbdf03219b80dba97ea2 | |
| parent | e1d7e7fcf8625857de6b48975096c127e5cb1534 [diff] | |
| parent | 6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Fix O_CLOEXEC values. [SPARC32]: Fix modular build of floppy driver. [SOUND] CS4231 SBus: Two fixes. [CG6]: fix memory size detection [SPARC64]: Add missing dma_sync_single_range_for_*().