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

* '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 <[email protected]>

diff --combined MAINTAINERS
index caec208de1ae482fb5e0824a9705eeb58b36ccf2,98f942eb7286dd652f37c18e75f835361e5d16b2..c07b1d7bb02ea9b6cf3e60ff5a84955ba756136d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -465,16 -465,6 +465,16 @@@ M:       Matt Turner <[email protected]
  L:    [email protected]
  F:    arch/alpha/
  
 +ALTERA UART/JTAG UART SERIAL DRIVERS
 +M:    Tobias Klauser <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/tty/serial/altera_uart.c
 +F:    drivers/tty/serial/altera_jtaguart.c
 +F:    include/linux/altera_uart.h
 +F:    include/linux/altera_jtaguart.h
 +
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  M:    Thomas Dahlmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -567,13 -557,6 +567,13 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +ARASAN COMPACT FLASH PATA CONTROLLER
 +M:    Viresh Kumar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    include/linux/pata_arasan_cf_data.h
 +F:    drivers/ata/pata_arasan_cf.c
 +
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <[email protected]>
  S:    Maintained
@@@ -1231,7 -1214,7 +1231,7 @@@ ATHEROS AR9170 WIRELESS DRIVE
  M:    Christian Lamparter <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ar9170
 -S:    Maintained
 +S:    Obsolete
  F:    drivers/net/wireless/ath/ar9170/
  
  CARL9170 LINUX COMMUNITY WIRELESS DRIVER
@@@ -1727,7 -1710,6 +1727,7 @@@ S:      Maintaine
  F:    Documentation/zh_CN/
  
  CISCO VIC ETHERNET NIC DRIVER
 +M:    Christian Benvenuti <[email protected]>
  M:    Vasanthy Kolluri <[email protected]>
  M:    Roopa Prabhu <[email protected]>
  M:    David Wang <[email protected]>
@@@ -2844,7 -2826,7 +2844,7 @@@ F:      mm/hwpoison-inject.
  HYPERVISOR VIRTUAL CONSOLE DRIVER
  L:    [email protected]
  S:    Odd Fixes
 -F:    drivers/char/hvc_*
 +F:    drivers/tty/hvc/
  
  iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
  M:    Peter Jones <[email protected]>
@@@ -3459,7 -3441,7 +3459,7 @@@ M:      Jiri Kosina <[email protected]
  M:    David Sterba <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
 -F:    drivers/char/pcmcia/ipwireless/
 +F:    drivers/tty/ipwireless/
  
  IPX NETWORK LAYER
  M:    Arnaldo Carvalho de Melo <[email protected]>
@@@ -3614,6 -3596,12 +3614,6 @@@ W:     http://lse.sourceforge.net/kdump
  S:    Maintained
  F:    Documentation/kdump/
  
 -KERNEL AUTOMOUNTER (AUTOFS)
 -M:    "H. Peter Anvin" <[email protected]>
 -L:    [email protected]
 -S:    Obsolete
 -F:    drivers/staging/autofs/
 -
  KERNEL AUTOMOUNTER v4 (AUTOFS4)
  M:    Ian Kent <[email protected]>
  L:    [email protected]
@@@ -4907,6 -4895,15 +4907,15 @@@ S:    Maintaine
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
  
+ PKUNITY SOC DRIVERS
+ M:    Guan Xuetao <[email protected]>
+ 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 <[email protected]>
  L:    [email protected]
@@@ -5170,7 -5167,6 +5179,7 @@@ RALINK RT2X00 WIRELESS LAN DRIVE
  P:    rt2x00 project
  M:    Ivo van Doorn <[email protected]>
  M:    Gertjan van Wingerde <[email protected]>
 +M:    Helmut Schaa <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://rt2x00.serialmonkey.com/
@@@ -6094,11 -6090,13 +6103,11 @@@ F:   sound/soc/codecs/twl4030
  TIPC NETWORK LAYER
  M:    Jon Maloy <[email protected]>
  M:    Allan Stephens <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (core kernel code)
 +L:    [email protected] (user apps, general discussion)
  W:    http://tipc.sourceforge.net/
 -W:    http://tipc.cslab.ericsson.net/
 -T:    git git://tipc.cslab.ericsson.net/pub/git/tipc.git
  S:    Maintained
  F:    include/linux/tipc*.h
 -F:    include/net/tipc/
  F:    net/tipc/
  
  TILE ARCHITECTURE
@@@ -6106,7 -6104,7 +6115,7 @@@ M:      Chris Metcalf <[email protected]
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
 -F:    drivers/char/hvc_tile.c
 +F:    drivers/tty/hvc/hvc_tile.c
  F:    drivers/net/tile/
  
  TLAN NETWORK DRIVER
@@@ -6270,6 -6268,13 +6279,13 @@@ F:    drivers/uwb
  F:    include/linux/uwb.h
  F:    include/linux/uwb/
  
+ UNICORE32 ARCHITECTURE:
+ M:    Guan Xuetao <[email protected]>
+ 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 <[email protected]>
  W:    http://dotat.at/prog/unifdef

diff --combined drivers/video/Kconfig
index e6791f7ecfb4ceb1b854c3041af6ac240c037262,ec55a87899abee39cbbaca4c03a5269539158b93..2a753f1e91838e851260caf716f97196d71ef7df
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -322,6 -322,69 +322,6 @@@ config FB_ARMCLC
          here and read <file:Documentation/kbuild/modules.txt>.  The module
          will be called amba-clcd.
  
 -choice
 -
 -      depends on FB_ARMCLCD && (ARCH_LH7A40X || ARCH_LH7952X)
 -      prompt "LCD Panel"
 -      default FB_ARMCLCD_SHARP_LQ035Q7DB02
 -
 -config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT
 -      bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC"
 -      help
 -        This is an implementation of the Sharp LQ035Q7DB02, a 3.5"
 -        color QVGA, HRTFT panel.  The LogicPD device includes
 -        an integrated HRTFT controller IC.
 -        The native resolution is 240x320.
 -
 -config FB_ARMCLCD_SHARP_LQ057Q3DC02
 -      bool "LogicPD LCD 5.7\" QVGA"
 -      help
 -        This is an implementation of the Sharp LQ057Q3DC02, a 5.7"
 -        color QVGA, TFT panel.  The LogicPD device includes an
 -        The native resolution is 320x240.
 -
 -config FB_ARMCLCD_SHARP_LQ64D343
 -      bool "LogicPD LCD 6.4\" VGA"
 -      help
 -        This is an implementation of the Sharp LQ64D343, a 6.4"
 -        color VGA, TFT panel.  The LogicPD device includes an
 -        The native resolution is 640x480.
 -
 -config FB_ARMCLCD_SHARP_LQ10D368
 -      bool "LogicPD LCD 10.4\" VGA"
 -      help
 -        This is an implementation of the Sharp LQ10D368, a 10.4"
 -        color VGA, TFT panel.  The LogicPD device includes an
 -        The native resolution is 640x480.
 -
 -
 -config FB_ARMCLCD_SHARP_LQ121S1DG41
 -      bool "LogicPD LCD 12.1\" SVGA"
 -      help
 -        This is an implementation of the Sharp LQ121S1DG41, a 12.1"
 -        color SVGA, TFT panel.  The LogicPD device includes an
 -        The native resolution is 800x600.
 -
 -        This panel requires a clock rate may be an integer fraction
 -        of the base LCDCLK frequency.  The driver will select the
 -        highest frequency available that is lower than the maximum
 -        allowed.  The panel may flicker if the clock rate is
 -        slower than the recommended minimum.
 -
 -config FB_ARMCLCD_AUO_A070VW01_WIDE
 -      bool "AU Optronics A070VW01 LCD 7.0\" WIDE"
 -      help
 -        This is an implementation of the AU Optronics, a 7.0"
 -        WIDE Color.  The native resolution is 234x480.
 -
 -config FB_ARMCLCD_HITACHI
 -      bool "Hitachi Wide Screen 800x480"
 -      help
 -        This is an implementation of the Hitachi 800x480.
 -
 -endchoice
 -
 -
  config FB_ACORN
        bool "Acorn VIDC support"
        depends on (FB = y) && ARM && ARCH_ACORN
@@@ -1942,7 -2005,6 +1942,7 @@@ config FB_SH_MOBILE_LCD
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO
 +      select FB_BACKLIGHT
        select SH_MIPI_DSI if SH_LCD_MIPI_DSI
        ---help---
          Frame buffer driver for the on-chip SH-Mobile LCD controller.
@@@ -2303,6 -2365,17 +2303,17 @@@ config FB_JZ474
        help
          Framebuffer support for the JZ4740 SoC.
  
+ config FB_PUV3_UNIGFX
+       tristate "PKUnity v3 Unigfx framebuffer support"
+       depends on FB && UNICORE32 && ARCH_PUV3
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       help
+         Choose this option if you want to use the Unigfx device as a
+         framebuffer device. Without the support of PCI & AGP.
+ 
  source "drivers/video/omap/Kconfig"
  source "drivers/video/omap2/Kconfig"