| commit | 88c8199b9d2f5ec0a8468a0495ba4c9656846500 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jul 31 15:50:35 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jul 31 15:50:35 2007 -0700 |
| tree | 666dc82c5a1ec041a7312f4ef3306bb1806620eb | |
| parent | 0439208a8a399f0c4307c561d97e3f5523f5d085 [diff] | |
| parent | 50aa485e1abb7566ce68418c7bbc6a6b454f9039 [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: [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.