Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:35:53 +0000 (00:35 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:35:53 +0000 (00:35 +0100)
commitb5c784894c90042f4fc6348aedc7524e899df281
tree0db86a93d73e4aabca04e361d7e6807aa4c1d307
parentff4fc3656e489ed6ee575959b0510286aefe1e20
parent1f2186951e02f2a5bcda9459f63136918932385a
Merge branch 'topic/asoc' into for-linus
arch/arm/mach-pxa/include/mach/regs-ssp.h