summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/generic.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-15 17:56:40 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-15 17:56:40 +0400
commitec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1 (patch)
treec7fcfd4ad7ad1875e611db3a2bd75d64f603c355 /arch/arm/mach-sa1100/generic.h
parent6bfb6aa91f61f2a7c526a6353c8c50676ca528da (diff)
parenta532f97c71c7a952531e02b0994104c532fbef0f (diff)
downloadlinux-ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1.tar.xz
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37
Trivial overlap with the removal of the local revision variable. Conflicts: sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
0 files changed, 0 insertions, 0 deletions