Linus Torvalds 5a62f99544 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits) powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA powerpc/pseries: Fix VPHN build errors on non-SMP systems powerpc/83xx: add mpc8308_p1m DMA controller device-tree node powerpc/83xx: add DMA controller to mpc8308 device-tree node powerpc/512x: try to free dma descriptors in case of allocation failure powerpc/512x: add MPC8308 dma support powerpc/512x: fix the hanged dma transfer issue powerpc/512x: scatter/gather dma fix powerpc/powermac: Make auto-loading of therm_pm72 possible of/address: Use propper endianess in get_flags powerpc/pci: Use printf extension %pR for struct resource powerpc: Remove unnecessary casts of void ptr powerpc: Disable VPHN polling during a suspend operation powerpc/pseries: Poll VPA for topology changes and update NUMA maps powerpc: iommu: Add device name to iommu error printks powerpc: Record vma->phys_addr in ioremap() powerpc: Update compat_arch_ptrace powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S powerpc/time: printk time stamp init not correct powerpc: Minor cleanups for machdep.h ...		2011-01-11 16:31:41 -08:00
..
agp	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2011-01-10 17:11:39 -08:00
hw_random	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
ip2	ip2: fix compiler warning on ip2main_pci_tbl	2010-12-10 15:20:15 -08:00
ipmi	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-11 11:02:13 -08:00
mwave	…
pcmcia	pcmcia/ipwireless: don't use flush_scheduled_work()	2010-12-24 15:59:06 +01:00
rio	…
tpm	Merge branch 'master' into next	2011-01-10 09:46:24 +11:00
xilinx_hwicap	…
Kconfig	drivers: char: hvc: add arm JTAG DCC console support	2010-11-30 17:27:13 -08:00
Makefile	drivers: char: hvc: add arm JTAG DCC console support	2010-11-30 17:27:13 -08:00
amiserial.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
apm-emulation.c	…
applicom.c	…
applicom.h	…
bfin-otp.c	…
bfin_jtag_comm.c	…
briq_panel.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
bsr.c	…
cd1865.h	…
cs5535_gpio.c	…
cyclades.c	…
digi1.h	…
digiFep1.h	…
digiPCI.h	…
ds1302.c	…
ds1620.c	…
dsp56k.c	…
dtlk.c	…
efirtc.c	…
epca.c	…
epca.h	…
epcaconfig.h	…
generic_nvram.c	…
generic_serial.c	…
genrtc.c	…
hangcheck-timer.c	…
hpet.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
hvc_beat.c	…
hvc_console.c	…
hvc_console.h	…
hvc_dcc.c	drivers: char: hvc: add arm JTAG DCC console support	2010-11-30 17:27:13 -08:00
hvc_irq.c	…
hvc_iseries.c	…
hvc_iucv.c	…
hvc_rtas.c	…
hvc_tile.c	…
hvc_udbg.c	…
hvc_vio.c	drivers/char/hvc_vio: Use static const char arrays	2010-11-29 15:48:18 +11:00
hvc_xen.c	…
hvcs.c	…
hvsi.c	hvsi: don't use flush_scheduled_work()	2010-12-24 15:59:07 +01:00
i8k.c	Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again)	2010-11-15 13:27:06 -08:00
isicom.c	…
istallion.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
lp.c	…
mbcs.c	…
mbcs.h	…
mem.c	…
misc.c	…
mmtimer.c	…
moxa.c	…
moxa.h	…
mspec.c	…
mxser.c	…
mxser.h	…
nozomi.c	nozomi: Fix warning from the previous TIOCGCOUNT changes	2010-11-09 14:49:38 -08:00
nsc_gpio.c	…
nvram.c	…
nwbutton.c	…
nwbutton.h	…
nwflash.c	…
pc8736x_gpio.c	…
ppdev.c	…
ps3flash.c	…
ramoops.c	RAMOOPS: Don't overflow over non-allocated regions	2010-12-28 11:12:32 -08:00
random.c	random: Use this_cpu_inc_return	2010-12-17 15:18:05 +01:00
raw.c	…
riscom8.c	…
riscom8.h	…
riscom8_reg.h	…
rocket.c	rocket: fix compiler warning on rocket_pci_ids	2010-12-10 15:20:14 -08:00
rocket.h	…
rocket_int.h	…
rtc.c	…
scc.h	…
scx200_gpio.c	…
ser_a2232.c	…
ser_a2232.h	…
ser_a2232fw.ax	…
ser_a2232fw.h	…
serial167.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
snsc.c	…
snsc.h	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
snsc_event.c	…
sonypi.c	sonypi: don't use flush_scheduled_work()	2010-12-24 15:59:07 +01:00
specialix.c	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
specialix_io8.h	…
stallion.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
sx.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
sx.h	…
sxboards.h	…
sxwindow.h	…
synclink.c	…
synclink_gt.c	…
synclinkmp.c	…
tb0219.c	…
tlclk.c	…
toshiba.c	…
ttyprintk.c	…
uv_mmtimer.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
viotape.c	…
virtio_console.c	Char: virtio_console, fix memory leak	2010-11-24 15:21:12 +10:30
vme_scc.c	…