]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 25 Oct 2010 08:41:30 +0000 (10:41 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 25 Oct 2010 08:41:30 +0000 (10:41 +0200)
commit4993808134da376e2040a40a985e07ca4dd996ae
treeeba675a57b0201c8f30436d08cab03c5dcd235ba
parent96533c62b7f829522ea1d129dc6c26f59ce0f5da
parent506ecbca71d07fa327dd986be1682e90885678ee
Merge branch 'for-linus' into for-next

Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c