linux.git - Linux kernel mainline tree

summary refs log tree commit diff stats

path: root/sound/synth

diff options

author	Ingo Molnar <mingo@elte.hu>	2009-03-18 13:19:49 +0100
committer	Ingo Molnar <mingo@elte.hu>	2009-03-18 13:19:49 +0100
commit	705bb9dc72b2464a7e421ee45d5e4a3f206d5c75 (patch)
tree	4ca54c86d3661b3a4ae2b63aa9ead20835a422d1 /sound/synth
parent	250981e6e1ef04947eccaa55e8c25ddcaa47a02e (diff)
parent	48f4c485c275e9550fa1a1191768689cc3ae0037 (diff)
parent	f4c3c4cdb1de232ff37cf4339eb2f36c84e20da6 (diff)
parent	a6b6a14e0c60561f2902b078bd28d0e61defad70 (diff)
parent	0920dce7d5889634faa336f65833ee44f3b7651e (diff)
parent	4e16c888754468a58d4829c2eba2c6aa3a065e2b (diff)
parent	be721696cac9d66566d59b205ee573ecb2f7c35b (diff)
parent	0a699af8e613a670be50245366fa18cb19ac5172 (diff)
parent	42854dc0a6320ff36722749acafa0697522d9556 (diff)
parent	2c74d66624ddbda8101d54d1e184cf9229b378bc (diff)
parent	ce4e240c279a31096f74afa6584a62d64a1ba8c8 (diff)
parent	ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff)
download	linux-705bb9dc72b2464a7e421ee45d5e4a3f206d5c75.tar.gz linux-705bb9dc72b2464a7e421ee45d5e4a3f206d5c75.tar.bz2 linux-705bb9dc72b2464a7e421ee45d5e4a3f206d5c75.zip

Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', 'x86/mtrr', 'x86/setup', 'x86/setup-memory', 'x86/urgent', 'x86/uv', 'x86/x2apic' and 'linus' into x86/core

Conflicts: arch/parisc/kernel/irq.c