Linus Walleij
66e0c12f9e
ARM: nomadik: switch to use the Nomadik I2C driver ...
Instead of using bit-banged I2C, let's use the actual I2C
driver in the kernel. Since the I2C block may be communicating
with things like the PMIC, we need to select it from the Kconfig
just like the bit-banged adapter is selected today. The rest of
the configuration for this driver can be done from the device
tree.
Signed-off-by: Linus Walleij <[email protected] >
2013-08-07 00:59:06 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-07-14 11:42:26 -07:00
Couple of Platform updates (Device Tree files primarily) given that the
2013-07-10 10:11:26 -07:00
ARM: nomadik: switch to use the Nomadik I2C driver
2013-08-07 00:59:06 +02:00
Merge tag 'kvm-3.11-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-07-10 18:17:41 -07:00
net: rename busy poll socket op and globals
2013-07-10 17:08:27 -07:00
blackfin updates for Linux 3.11
2013-07-10 10:12:58 -07:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
net: rename busy poll socket op and globals
2013-07-10 17:08:27 -07:00
net: rename busy poll socket op and globals
2013-07-10 17:08:27 -07:00
net: rename busy poll socket op and globals
2013-07-10 17:08:27 -07:00
mm/hexagon: prepare for removing num_physpages and simplify mem_init()
2013-07-03 16:07:36 -07:00
net: rename busy poll socket op and globals
2013-07-10 17:08:27 -07:00
net: rename busy poll socket op and globals
2013-07-10 17:08:27 -07:00
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
arch/metag fixes for v3.11
2013-07-10 10:14:35 -07:00
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
2013-07-10 10:16:07 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-13 17:42:22 -07:00
net: rename busy poll socket op and globals
2013-07-10 17:08:27 -07:00
mm: invoke oom-killer from remaining unconverted page fault handlers
2013-07-09 10:33:20 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-07-14 11:42:26 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-13 17:42:22 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-13 17:42:22 -07:00
mm: invoke oom-killer from remaining unconverted page fault handlers
2013-07-09 10:33:20 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-07-14 11:42:26 -07:00
mm: remove free_area_cache
2013-07-10 18:11:34 -07:00
mm/um: prepare for removing num_physpages and simplify mem_init()
2013-07-03 16:07:37 -07:00
reboot: move arch/x86 reboot= handling to generic kernel
2013-07-09 10:33:29 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-13 15:35:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-13 17:42:22 -07:00
mm: soft-dirty bits for user memory changes tracking
2013-07-03 16:07:26 -07:00
66e0c12f9e