diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 14:56:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 14:56:40 +0100 |
| commit | ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1 (patch) | |
| tree | c7fcfd4ad7ad1875e611db3a2bd75d64f603c355 /arch/m32r/include/asm/pci.h | |
| parent | 6bfb6aa91f61f2a7c526a6353c8c50676ca528da (diff) | |
| parent | a532f97c71c7a952531e02b0994104c532fbef0f (diff) | |
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/m32r/include/asm/pci.h')
0 files changed, 0 insertions, 0 deletions