summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-10 19:51:07 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-10 19:51:07 +0000
commitf455dfb106916d855d59686fe16575c2ceb2cb2a (patch)
treede705fc7037b03c75490871c4a4ce1ab659a7c7a /arch/arm/mach-footbridge
parentcbf1146d5ee113152c5cdeb54ff9d4b2f0c91736 (diff)
downloadtalos-op-linux-f455dfb106916d855d59686fe16575c2ceb2cb2a.tar.gz
talos-op-linux-f455dfb106916d855d59686fe16575c2ceb2cb2a.zip
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>
Diffstat (limited to 'arch/arm/mach-footbridge')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud