Linus Torvalds
0bd2cbcdfa
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 ...
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
of/flattree: forward declare struct device_node in of_fdt.h
ipmi: explicitly include of_address.h and of_irq.h
sparc: explicitly cast negative phandle checks to s32
powerpc/405: Fix missing #{address,size}-cells in i2c node
powerpc/5200: dts: refactor dts files
powerpc/5200: dts: Change combatible strings on localbus
powerpc/5200: dts: remove unused properties
powerpc/5200: dts: rename nodes to prepare for refactoring dts files
of/flattree: Update dtc to current mainline.
of/device: Don't register disabled devices
powerpc/dts: fix syntax bugs in bluestone.dts
of: Fixes for OF probing on little endian systems
of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
of/flattree: Add of_flat_dt_match() helper function
of_serial: explicitly include of_irq.h
of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
of/flattree: Reorder unflatten_dt_node
of/flattree: Refactor unflatten_dt_node
of/flattree: Add non-boottime device tree functions
of/flattree: Add Kconfig for EARLY_FLATTREE
...
Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.
2011-01-10 08:57:03 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2011-01-10 08:22:33 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-01-04 11:57:25 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2011-01-10 08:15:37 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2011-01-10 08:57:03 -08:00
perf: Clean up power events by introducing new, more generic ones
2011-01-04 08:16:54 +01:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
dma: shdma: don't register the global die notifier multiple times
2011-01-07 11:03:26 +09:00
Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
2011-01-07 14:54:03 -08:00
firewire: use split transaction timeout only for split transactions
2011-01-04 08:48:34 +01:00
Merge branch 'devel-stable' into devel
2011-01-06 22:33:32 +00:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2011-01-10 08:15:37 -08:00
hwmon: (s3c-hwmon) Fix compilation
2011-01-02 15:31:11 -08:00
perf: Clean up power events by introducing new, more generic ones
2011-01-04 08:16:54 +01:00
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
2011-01-07 08:56:33 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2011-01-10 08:15:37 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2011-01-10 08:57:03 -08:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2011-01-10 08:57:03 -08:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2011-01-10 08:57:03 -08:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2011-01-10 08:57:03 -08:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2011-01-10 08:57:03 -08:00
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
Merge branch 'devel-stable' into devel
2011-01-06 22:33:32 +00:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-01-06 11:06:31 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
sparc: explicitly cast negative phandle checks to s32
2011-01-03 20:02:06 -07:00
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2011-01-10 08:22:33 -08:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2011-01-10 08:57:03 -08:00
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
2011-01-10 08:14:53 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-01-07 14:39:20 -08:00
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-01-10 08:48:46 -08:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-01-06 16:50:35 -08:00
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-01-10 08:48:46 -08:00
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
0bd2cbcdfa