Nobuhiro Iwamatsu 83fc3bc095 ALSA: emu10k1: Fix warning: "CCR" redefined ... CCR is defined in emu10k1, but SuperH is defined too. If user use this driver with SuperH, it becomes a double definition. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>		2010-10-18 07:45:44 +02:00
..
acpi	ACPI: Fix typos	2010-09-28 21:38:19 -04:00
asm-generic	gpio: doc updates	2010-09-09 18:57:24 -07:00
crypto
drm	drm/ttm: Fix two race conditions + fix busy codepaths	2010-10-06 09:04:43 +10:00
keys	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
linux	Un-inline the core-dump helper functions	2010-10-14 14:32:06 -07:00
math-emu
media	V4L/DVB: videobuf-dma-sg: set correct size in last sg element	2010-09-27 22:22:01 -03:00
mtd	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
net	Bluetooth: Fix deadlock in the ERTM logic	2010-09-30 12:19:35 -03:00
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
rdma	IB: Rename RAW_ETY to RAW_ETHERTYPE	2010-08-04 10:44:19 -07:00
rxrpc
scsi	scsi: use __uX types for headers exported to user space	2010-08-11 08:59:01 -07:00
sound	ALSA: emu10k1: Fix warning: "CCR" redefined	2010-10-18 07:45:44 +02:00
trace	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-24 12:21:49 -07:00
video	include: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
xen	xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield	2010-08-23 12:01:35 +01:00
Kbuild