]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'fixes' and 'next/dt' into for-next
authorArnd Bergmann <arnd@arndb.de>
Wed, 4 Mar 2015 22:51:30 +0000 (23:51 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 4 Mar 2015 22:51:30 +0000 (23:51 +0100)
commit030410db5585d309b4c3dd3ecbaff10187698df8
tree7327d9e45394ed1cb9bc5250764ac1a4ab153e60
parent2ee4716a996d81575bbd0db0d1c79aa38c03f939
parentb09e0ec4ddcb951c1c377ab114db5610eb7f3c98
parent66c9270b6898de629ab2a7428e56993800ea9a6c
Merge branches 'fixes' and 'next/dt' into for-next

* fixes:
  ARM: multi_v7_defconfig: increase the number of maximum number of CPUs to 16
  ARM: sunxi_defconfig: increase the number of maximum number of CPUs to 8

* next/dt:
  devicetree: Add TI-NSPIRE USB OTG support to device tree