Geert Uytterhoeven f1eaaf8fce Revert "ALSA: emu10k1: Fix warning: "CCR" redefined" ...

This reverts commit 83fc3bc095.

sh-specific "CCR" and "CCR2" have been prefixed by "SH_" in commit
a5f6ea29f9 ('sh: prefix sh-specific "CCR" and
"CCR2" by "SH_"').

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

2014-03-11 07:54:14 +01:00

..

acpi

Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'

2014-01-29 11:47:18 +01:00

asm-generic

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2014-01-27 21:03:39 -08:00

clocksource

…

crypto

…

drm

Merge tag 'drm-intel-fixes-2014-02-06' of ssh://git.freedesktop.org/git/drm-intel into drm-next

2014-02-11 12:57:27 +10:00

dt-bindings

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2014-01-30 17:07:18 -08:00

keys

…

kvm

…

linux

Merge branches 'irq-urgent-for-linus' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-02-15 16:06:12 -08:00

math-emu

…

media

…

memory

…

misc

…

net

net: Move prototype declaration to header file include/net/net_namespace.h from net/ipx/af_ipx.c

2014-02-09 17:32:50 -08:00

pcmcia

…

ras

…

rdma

IB: Report using RoCE IP based gids in port caps

2014-02-13 14:46:03 -08:00

rxrpc

…

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2014-01-31 15:31:23 -08:00

sound

Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"

2014-03-11 07:54:14 +01:00

target

target: Simplify command completion by removing CMD_T_FAILED flag

2014-02-12 15:14:30 -08:00

trace

intel_pstate: Remove energy reporting from pstate_sample tracepoint

2014-02-13 02:11:18 +01:00

uapi

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

2014-02-16 11:05:27 -08:00

video

…

xen

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2014-02-14 10:45:18 -08:00

Kbuild

…