]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cbf1146) | patch
ASoC: Fix up merge with the ARM tree
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Mar 2009 19:51:07 +0000 (19:51 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Mar 2009 19:51:07 +0000 (19:51 +0000)
commitf455dfb106916d855d59686fe16575c2ceb2cb2a
treede705fc7037b03c75490871c4a4ce1ab659a7c7atree | snapshot
parentcbf1146d5ee113152c5cdeb54ff9d4b2f0c91736commit | diff
ASoC: Fix up merge with the ARM tree

The same change has been made with the final lines in slightly differnet
orders.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
arch/arm/mach-shark/include/mach/io.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.