diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-01 00:50:35 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-01 00:50:35 +0200 |
commit | 88c8199b9d2f5ec0a8468a0495ba4c9656846500 (patch) | |
tree | 666dc82c5a1ec041a7312f4ef3306bb1806620eb /net | |
parent | rtc-m48t59 driver NO_IRQ mode fixup (diff) | |
parent | [BBC_I2C]: kmalloc + memset conversion to kzalloc (diff) | |
download | linux-88c8199b9d2f5ec0a8468a0495ba4c9656846500.tar.xz linux-88c8199b9d2f5ec0a8468a0495ba4c9656846500.zip |
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:
[BBC_I2C]: kmalloc + memset conversion to kzalloc
[BBC_ENVCTRL]: kmalloc + memset conversion to kzalloc
[SPARC]: Fix exec failures on sun4c.
[SPARC] Videopix Frame Grabber: Fix unreleased lock in vfc_debug()
[SPARC64]: Add missing dma_get_cache_alignment().
[SUNLANCE]: Fix sparc32 crashes by using of_*() interfaces.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions