diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 14:58:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 14:58:08 -0700 |
commit | 1a3f2ea336b784d7df750a7821f514f3dea69e29 (patch) | |
tree | b7c2f5c7cc841d9f7b38fbdf03219b80dba97ea2 /kernel | |
parent | e1d7e7fcf8625857de6b48975096c127e5cb1534 (diff) | |
parent | 6ba60d2195cd65d72eaf7ce3903a707c5bf20c7b (diff) | |
download | op-kernel-dev-1a3f2ea336b784d7df750a7821f514f3dea69e29.zip op-kernel-dev-1a3f2ea336b784d7df750a7821f514f3dea69e29.tar.gz |
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_*().
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions