Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (60 commits)
  Blackfin arch: make sure we include the fix for SPORT hysteresis when reprogramming clocks
  Blackfin arch: Fix bogus str_ident check in gpio code
  Blackfin arch: AD7879 Touchscreen driver
  Blackfin arch: introducing bfin_addr_dcachable
  Blackfin arch: fix a typo in comments
  Blackfin arch: Remove useless head file
  Blackfin arch: make sure L2 start and length are always defined (fixes building on BF542)
  Blackfin arch: use the Blackfin on-chip ROM to do software reset when possible
  Blackfin arch: update anomaly headers to match the latest sheet
  Blackfin arch: bfin_reset() is an internal reboot function ... everyone should go through machine_restart()
  Blackfin arch: print out error/warning if you are running on the incorrect CPU type
  Blackfin arch: remove non-bf54x ifdef logic since this file is only compiled on bf54x parts
  Blackfin arch: update board defconfigs
  Blackfin arch: Add optional verbose debug
  Blackfin arch: emulate a TTY over the EMUDAT/JTAG interface
  Blackfin arch: have is_user_addr_valid() check for overflows (like when address is -1)
  Blackfin arch: ptrace - fix off-by-one check on end of memory regions
  Blackfin arch: Enable framebuffer support for the BF526-EZkit TFT LCD display
  Blackfin arch: flash memory map and dm9000 resources updating
  Blackfin arch: early prink code still use uart core console functions to parse and set configure option string
  ...

diff --combined arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h
index 815bfe5dd1a99a74d06f1f86ef16c764ac990271,993464ee93c34805304f5366f277db4d90b45128..34ab0e4e42423a29ff910f4f8fed6a8f07b4d5a6
--- 1/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h
--- 2/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h
+++ b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h
@@@ -69,8 -69,6 +69,8 @@@
  # endif
  #endif
  
 +#define BFIN_UART_TX_FIFO_SIZE        2
 +
  struct bfin_serial_port {
          struct uart_port        port;
          unsigned int            old_status;
@@@ -85,7 -83,7 +85,7 @@@
        unsigned int            rx_dma_channel;
        struct work_struct      tx_dma_workqueue;
  #else
- # if ANOMALY_05000230
+ # if ANOMALY_05000363
        unsigned int anomaly_threshold;
  # endif
  #endif
@@@ -113,6 -111,7 +113,6 @@@ static inline void UART_CLEAR_LSR(struc
        bfin_write16(uart->port.membase + OFFSET_LSR, -1);
  }
  
 -struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
  struct bfin_serial_res {
        unsigned long   uart_base_addr;
        int             uart_irq;
@@@ -143,6 -142,7 +143,6 @@@ struct bfin_serial_res bfin_serial_reso
  
  #define DRIVER_NAME "bfin-uart"
  
 -int nr_ports = BFIN_UART_NR_PORTS;
  static void bfin_serial_hw_init(struct bfin_serial_port *uart)
  {
  

diff --combined arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h
index e0ce0c1843d458bb28b6ee6e53eb9e7747e2566b,8552a67654c869535ec34483d1615f348b83f2f1..f5327264357cb2dd0a96d26eb4a734fc5bd3fddc
--- 1/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h
--- 2/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h
+++ b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h
@@@ -69,8 -69,6 +69,8 @@@
  # endif
  #endif
  
 +#define BFIN_UART_TX_FIFO_SIZE        2
 +
  struct bfin_serial_port {
          struct uart_port        port;
          unsigned int            old_status;
@@@ -85,7 -83,7 +85,7 @@@
        unsigned int            rx_dma_channel;
        struct work_struct      tx_dma_workqueue;
  #else
- # if ANOMALY_05000230
+ # if ANOMALY_05000363
        unsigned int anomaly_threshold;
  # endif
  #endif
@@@ -113,6 -111,7 +113,6 @@@ static inline void UART_CLEAR_LSR(struc
        bfin_write16(uart->port.membase + OFFSET_LSR, -1);
  }
  
 -struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS];
  struct bfin_serial_res {
        unsigned long   uart_base_addr;
        int             uart_irq;
@@@ -143,6 -142,7 +143,6 @@@ struct bfin_serial_res bfin_serial_reso
  
  #define DRIVER_NAME "bfin-uart"
  
 -int nr_ports = BFIN_UART_NR_PORTS;
  static void bfin_serial_hw_init(struct bfin_serial_port *uart)
  {