]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jun 2011 19:52:05 +0000 (12:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jun 2011 19:52:05 +0000 (12:52 -0700)
* 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32:
  unicore32: using generic-y format for one line asm-generic files
  unicore32: change PERCPU to PERCPU_SECTION
  unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)
  unicore32: change zImage physical address, though it's PIC codes
  unicore32: move rtc-puv3.c to drivers/rtc directory


Trivial merge