Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: (40 commits)
  unicore32: rewrite arch-specific tlb.h to use asm-generic version
  unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs
  unicore32: replace unicore32-specific iomap functions with generic lib implementation
  unicore32 machine related: add frame buffer driver for pkunity-v3 soc
  unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc
  unicore32 io: redefine __REG(x) and re-use readl/writel funcs
  unicore32 i8042 upgrade and bugfix: adjust resource request region type
  unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call
  unicore32 i8042: adjust io funcs of i8042-unicore32io.h
  unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE
  unicore32: modify function names and parameters for irq_chips
  unicore32: remove unused lines in arch/unicore32/include/asm/irq.h
  unicore32 time.c: change calculate method for clock_event_device
  unicore32: ADD MAINTAINER for unicore32 architecture
  unicore32 machine related files: ps2 driver
  unicore32 machine related files: pci bus handling
  unicore32 machine related files: hardware registers
  unicore32 machine related files: core files
  unicore32 additional architecture files: boot process
  unicore32 additional architecture files: low-level lib: misc
  ...

Acked-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 16 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index caec208de1ae..c07b1d7bb02e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4907,6 +4907,15 @@ S:	Maintained
 F:      drivers/block/pktcdvd.c
 F:      include/linux/pktcdvd.h
 
+PKUNITY SOC DRIVERS
+M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
+W:      http://mprc.pku.edu.cn/~guanxuetao/linux
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+F:      drivers/input/serio/i8042-unicore32io.h
+F:      drivers/i2c/busses/i2c-puv3.c
+F:      drivers/video/fb-puv3.c
+
 PMC SIERRA MaxRAID DRIVER
 M:      Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
 L:      linux-scsi@vger.kernel.org
@@ -6270,6 +6279,13 @@ F:	drivers/uwb/
 F:      include/linux/uwb.h
 F:      include/linux/uwb/
 
+UNICORE32 ARCHITECTURE:
+M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
+W:      http://mprc.pku.edu.cn/~guanxuetao/linux
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+F:      arch/unicore32/
+
 UNIFDEF
 M:      Tony Finch <dot@dotat.at>
 W:      http://dotat.at/prog/unifdef