]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb827a7 ab277bb)
Merge branch 'stable/for-linus-3.7' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 9 Nov 2012 12:51:12 +0000 (07:51 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 9 Nov 2012 12:51:12 +0000 (07:51 -0500)
* stable/for-linus-3.7:
  xen/arm: Fix compile errors when drivers are compiled as modules (export more).

Conflicts:
arch/arm/xen/enlighten.c

1  2 
arch/arm/xen/enlighten.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/xen/enlighten.c
Simple merge
Linux kernel for KaRo TX COM modules