Linus Torvalds 723e9db7a4 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: (134 commits) powerpc/nvram: Enable use Generic NVRAM driver for different size chips powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline powerpc/ps3: Workaround for flash memory I/O error powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead powerpc/perf_counters: Reduce stack usage of power_check_constraints powerpc: Fix bug where perf_counters breaks oprofile powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops powerpc/irq: Improve nanodoc powerpc: Fix some late PowerMac G5 with PCIe ATI graphics powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT powerpc/book3e: Add missing page sizes powerpc/pseries: Fix to handle slb resize across migration powerpc/powermac: Thermal control turns system off too eagerly powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan() powerpc/405ex: support cuImage via included dtb powerpc/405ex: provide necessary fixup function to support cuImage powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support. powerpc/44x: Update Arches defconfig powerpc/44x: Update Arches dts ... Fix up conflicts in drivers/char/agp/uninorth-agp.c		2009-09-15 09:51:09 -07:00
..
agp	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-09-15 09:51:09 -07:00
hw_random	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-09-11 09:38:37 -07:00
ip2
ipmi
mwave
pcmcia	hdlc: convert to netdev_tx_t	2009-09-01 01:13:31 -07:00
rio	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
tpm	TPM: Fixup boot probe timeout for tpm_tis driver	2009-09-10 19:19:09 +10:00
xilinx_hwicap
.gitignore
amiserial.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
apm-emulation.c
applicom.c
applicom.h
bfin-otp.c
bfin_jtag_comm.c	bfin_jtag_comm: clean up printk usage	2009-06-22 11:32:23 -07:00
briq_panel.c
bsr.c	powerpc/BSR: Fix BSR to allow mmap of small BSR on 64k kernel	2009-06-26 14:37:26 +10:00
cd1865.h
ChangeLog
consolemap.c
cp437.uni
cs5535_gpio.c
cyclades.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
defkeymap.c_shipped
defkeymap.map
digi1.h
digiFep1.h
digiPCI.h
ds1302.c
ds1620.c
dsp56k.c
dtlk.c	dtlk: off by one in {read,write}_tts()	2009-06-19 16:46:06 -07:00
efirtc.c
epca.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
epca.h
epcaconfig.h
esp.c
generic_nvram.c	powerpc/nvram: Enable use Generic NVRAM driver for different size chips	2009-09-11 16:02:11 +10:00
generic_serial.c
genrtc.c
hangcheck-timer.c
hpet.c
hvc_beat.c
hvc_console.c	hvc_console: Drop unnecessary NULL test	2009-08-20 10:29:23 +10:00
hvc_console.h
hvc_irq.c
hvc_iseries.c
hvc_iucv.c	[S390] proper use of device register	2009-09-11 10:29:45 +02:00
hvc_rtas.c
hvc_udbg.c
hvc_vio.c	hvc_console: Add __init and __exit to hvc_vio	2009-08-28 14:24:11 +10:00
hvc_xen.c
hvcs.c
hvsi.c	powerpc/hvsi: Avoid calculating possibly-invalid address	2009-08-20 10:29:28 +10:00
i8k.c
isicom.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
istallion.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
Kconfig	MIPS: Update VR41xx GPIO driver to use gpiolib	2009-07-03 15:45:25 +01:00
keyboard.c
lp.c
Makefile	MIPS: Update VR41xx GPIO driver to use gpiolib	2009-07-03 15:45:25 +01:00
mbcs.c
mbcs.h
mem.c	writeback: add name to backing_dev_info	2009-09-11 09:20:26 +02:00
misc.c
mmtimer.c
moxa.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
moxa.h
mspec.c
mxser.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
mxser.h
n_hdlc.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
n_r3964.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
n_tty.c	n_tty: do O_ONLCR translation as a single write	2009-09-05 12:46:07 -07:00
nozomi.c	tty: fix chars_in_buffers	2009-07-20 16:38:43 -07:00
nsc_gpio.c
nvram.c
nwbutton.c
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c	ppdev: reduce kernel log spam	2009-06-18 13:03:54 -07:00
ps3flash.c
pty.c	pty: don't limit the writes to 'pty_space()' inside 'pty_write()'	2009-09-05 13:27:10 -07:00
random.c
raw.c	vfs: Rename generic_file_aio_write_nolock	2009-09-14 17:08:15 +02:00
riscom8.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
riscom8.h
riscom8_reg.h
rocket.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
rocket.h
rocket_int.h
rtc.c
scc.h
scx200_gpio.c
selection.c
ser_a2232.c
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c	cleanup console_print()	2009-09-14 17:41:42 -07:00
snsc.c
snsc.h
snsc_event.c
sonypi.c
specialix.c	specialix.c: convert nested spin_lock_irqsave to spin_lock	2009-07-20 16:38:43 -07:00
specialix_io8.h
stallion.c
sx.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
sx.h
sxboards.h
sxwindow.h
synclink.c	hdlc: convert to netdev_tx_t	2009-09-01 01:13:31 -07:00
synclink_gt.c	hdlc: convert to netdev_tx_t	2009-09-01 01:13:31 -07:00
synclinkmp.c	hdlc: convert to netdev_tx_t	2009-09-01 01:13:31 -07:00
sysrq.c	debug lockups: Improve lockup detection, fix generic arch fallback	2009-08-03 09:56:52 +02:00
tb0219.c	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
tlclk.c
toshiba.c
tty_audit.c
tty_buffer.c	pty: avoid forcing 'low_latency' tty flag	2009-07-29 12:15:56 -07:00
tty_io.c
tty_ioctl.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
tty_ldisc.c	tty: make sure to flush any pending work when halting the ldisc	2009-08-25 09:12:43 -07:00
tty_port.c	tty_port: Fix return on interrupted use	2009-07-17 08:50:43 -07:00
vc_screen.c	vc: create vcs(a) devices for consoles	2009-07-20 16:38:43 -07:00
viotape.c
virtio_console.c
vme_scc.c
vt.c	vt: drop bootmem/slab memory distinction	2009-07-16 09:19:16 -07:00
vt_ioctl.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00