Grant Likely
cf9b59e9d3
Merge remote branch 'origin' into secretlab/next-devicetree
...
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
acpi
ACPICA: Update version to 20100428.
2010-05-06 03:05:54 -04:00
asm-generic
Merge git://git.infradead.org/iommu-2.6
2010-05-21 17:25:01 -07:00
crypto
crypto: skcipher - Add ablkcipher_walk interfaces
2010-05-19 14:13:07 +10:00
drm
Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2010-05-21 11:14:52 -07:00
keys
linux
Merge remote branch 'origin' into secretlab/next-devicetree
2010-05-22 00:36:56 -06:00
math-emu
media
V4L/DVB: v4l2-subdev.h: Add support for enum_dv_preset
2010-05-19 12:59:01 -03:00
mtd
net
ipv6: Replace inet6_ifaddr->dead with state
2010-05-18 15:36:06 -07:00
pcmcia
pcmcia: remove unused mem_op.h
2010-05-10 10:23:20 +02:00
rdma
rxrpc
scsi
[SCSI] libfc: Move the port_id into lport
2010-05-16 22:22:34 -04:00
sound
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2010-05-20 09:41:44 -07:00
trace
Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2010-05-21 17:16:21 -07:00
video
xen
Kbuild