]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96533c6 506ecbc)
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)
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c


Trivial merge
Linux kernel for KaRo TX COM modules