summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/colibri-pxa3xx.c
diff options
context:
space:
mode:
authorLinus Torvalds2009-05-22 22:38:52 +0200
committerLinus Torvalds2009-05-22 22:38:52 +0200
commit2528ed119b8f4fc553f9d1e65719ae183ffa97f4 (patch)
tree8ca7caff8ab0c8f6d349cb0feab360e08a3cc3d9 /arch/arm/mach-pxa/colibri-pxa3xx.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff)
parentMerge branch 'fix/misc' into for-linus (diff)
downloadkernel-qcow2-linux-2528ed119b8f4fc553f9d1e65719ae183ffa97f4.tar.gz
kernel-qcow2-linux-2528ed119b8f4fc553f9d1e65719ae183ffa97f4.tar.xz
kernel-qcow2-linux-2528ed119b8f4fc553f9d1e65719ae183ffa97f4.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: Kill truncate warning by shortening Sigmatel-specific AC97 control name ALSA: hda - fix audio on HP TX25xx series notebooks ALSA: pcsp - fix printk format warning again
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa3xx.c')
0 files changed, 0 insertions, 0 deletions