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

..

accessibility

…

acpi

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

amba

…

ata

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

atm

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

auxdisplay

…

base

driver-core: fix Typo in drivers/base/core.c for CONFIG_MODULE

2010-05-21 09:37:32 -07:00

block

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-20 21:04:44 -07:00

cdrom

of: Always use 'struct device.of_node' to get device node pointer.

2010-05-18 16:10:44 -06:00

char

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

clocksource

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-05-19 17:10:57 -07:00

connector

…

cpufreq

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-05-18 08:49:13 -07:00

cpuidle

PM QOS update

2010-05-10 23:08:19 +02:00

crypto

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

dca

…

dio

…

dma

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

edac

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

eisa

…

firewire

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

2010-05-20 09:20:59 -07:00

firmware

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

gpio

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

gpu

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

hid

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

2010-05-21 10:51:03 -07:00

hwmon

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

i2c

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

ide

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

idle

…

ieee1394

…

ieee802154

…

infiniband

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

input

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

isdn

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

2010-05-21 17:15:44 -07:00

leds

of: Remove duplicate fields from of_platform_driver

2010-05-22 00:10:40 -06:00

lguest

…

macintosh

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

mca

…

md

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

2010-05-21 19:37:45 -07:00

media

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

2010-05-20 21:26:12 -07:00

memstick

…

message

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2010-05-21 07:19:18 -07:00

mfd

Merge branch 'topic/asoc' into for-linus

2010-05-20 12:00:43 +02:00

misc

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2010-05-21 11:17:05 -07:00

mmc

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

mtd

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

net

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

nubus

…

of

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

oprofile

oprofile: protect from not being in an IRQ context

2010-05-03 23:02:39 +02:00

parisc

…

parport

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

pci

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2010-05-21 18:58:52 -07:00

pcmcia

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

platform

Move N014, N051 and CR620 dmi information to load scm dmi table

2010-05-20 10:16:13 -04:00

pnp

Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzilla-15903' and 'misc-2.6.34' into release

2010-05-06 22:04:31 -04:00

power

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

pps

…

ps3

…

rapidio

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

regulator

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

2010-05-20 09:20:59 -07:00

rtc

RTC: rtc-cmos: Fix binary mode support

2010-05-21 21:31:19 +01:00

s390

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

sbus

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

scsi

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

serial

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

sfi

…

sh

sh: simplify WARN usage in SH clock driver

2010-05-13 17:43:11 +09:00

sn

…

spi

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

ssb

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-20 21:04:44 -07:00

staging

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2010-05-21 15:26:46 -07:00

tc

…

telephony

pcmcia: dev_node removal (write-only drivers)

2010-05-10 10:23:14 +02:00

thermal

…

uio

…

usb

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

uwb

…

vhost

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-05-16 22:26:58 -07:00

video

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

virtio

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

2010-05-21 17:22:52 -07:00

vlynq

vlynq: make whole Kconfig-menu dependant on architecture

2010-05-14 16:59:54 +02:00

w1

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

watchdog

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

xen

stop_machine: reimplement using cpu_stop

2010-05-06 18:49:20 +02:00

zorro

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

Kconfig

…

Makefile

virtio: initialize earlier

2010-05-07 14:01:17 -07:00