Linus Torvalds 2acb802b0c Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc ...

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Remove use of CONFIG_PPC_MERGE
  powerpc: Force printing of 'total_memory' to unsigned long long
  powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
  powerpc: Move include files to arch/powerpc/include/asm

2008-08-04 17:25:06 -07:00

..

agp

…

hw_random

stop_machine: Wean existing callers off stop_machine_run()

2008-07-28 12:16:31 +10:00

ip2

ip2: push BKL down for the firmware interface

2008-07-25 10:53:43 -07:00

ipmi

ipmi/powerpc: Use linux/of_{device,platform}.h instead of asm

2008-07-30 15:26:53 +10:00

mwave

mwave: ioctl BKL pushdown

2008-07-25 10:53:43 -07:00

pcmcia

ipwireless: fix compile failure

2008-07-28 15:12:37 -07:00

rio

rio: push down the BKL into the firmware ioctl handler

2008-07-25 10:53:43 -07:00

tpm

tpm: Use correct data types for sizes in tpm_write() and tpm_read()

2008-07-26 12:00:04 -07:00

xilinx_hwicap

char/xilinx_hwicap/xilinx_hwicap.c: Removed duplicated include

2008-07-25 09:23:31 -07:00

.gitignore

…

amiserial.c

…

apm-emulation.c

…

applicom.c

…

applicom.h

…

bfin-otp.c

…

briq_panel.c

…

bsr.c

…

cd1865.h

…

ChangeLog

…

consolemap.c

…

cp437.uni

…

cs5535_gpio.c

…

cyclades.c

…

defkeymap.c_shipped

…

defkeymap.map

…

digi1.h

…

digiFep1.h

…

digiPCI.h

…

ds1286.c

…

ds1302.c

ds1302: push down the BKL into the driver ioctl code

2008-07-25 10:53:43 -07:00

ds1620.c

…

dsp56k.c

dsp56k: Fix BKL pushdown

2008-07-26 13:22:56 -07:00

dtlk.c

…

efirtc.c

drivers/char/efirtc.c: removed duplicated #include

2008-08-04 16:59:56 -07:00

epca.c

…

epca.h

…

epcaconfig.h

…

esp.c

…

generic_nvram.c

…

generic_serial.c

…

genrtc.c

…

hangcheck-timer.c

…

hpet.c

#if 0 hpet_unregister()

2008-07-25 10:53:43 -07:00

hvc_beat.c

…

hvc_console.c

virtio: console as a config option

2008-07-25 12:06:07 +10:00

hvc_console.h

powerpc: Move include files to arch/powerpc/include/asm

2008-08-04 12:02:00 +10:00

hvc_irq.c

hvc_console: rework setup to replace irq functions with callbacks

2008-07-25 12:06:06 +10:00

hvc_iseries.c

hvc_console: rework setup to replace irq functions with callbacks

2008-07-25 12:06:06 +10:00

hvc_rtas.c

…

hvc_vio.c

hvc_console: rework setup to replace irq functions with callbacks

2008-07-25 12:06:06 +10:00

hvc_xen.c

hvc_console: rework setup to replace irq functions with callbacks

2008-07-25 12:06:06 +10:00

hvcs.c

powerpc: Move include files to arch/powerpc/include/asm

2008-08-04 12:02:00 +10:00

hvsi.c

…

i8k.c

…

ip27-rtc.c

…

isicom.c

…

istallion.c

…

Kconfig

Merge git://git.infradead.org/embedded-2.6

2008-07-25 12:02:08 -07:00

keyboard.c

…

lp.c

…

Makefile

Merge git://git.infradead.org/embedded-2.6

2008-07-25 12:02:08 -07:00

mbcs.c

…

mbcs.h

…

mem.c

…

misc.c

…

mmtimer.c

…

moxa.c

…

moxa.h

…

mspec.c

…

mxser.c

Char: mxser, ratelimit ioctl warning

2008-07-30 09:41:45 -07:00

mxser.h

…

n_hdlc.c

…

n_r3964.c

…

n_tty.c

…

nozomi.c

…

nsc_gpio.c

…

nvram.c

…

nwbutton.c

…

nwbutton.h

…

nwflash.c

[ARM] fix nwflash.c: 6ee8928d94

2008-07-26 16:29:24 +01:00

pc8736x_gpio.c

…

ppdev.c

ppdev: wrap ioctl handler in driver and push lock down

2008-07-25 10:53:43 -07:00

ps3flash.c

…

pty.c

…

random.c

…

raw.c

…

riscom8_reg.h

…

riscom8.c

…

riscom8.h

…

rocket_int.h

…

rocket.c

…

rocket.h

…

rtc.c

drivers/char/rtc.c: make 2 functions static

2008-07-26 12:00:12 -07:00

scc.h

…

scx200_gpio.c

…

selection.c

…

ser_a2232.c

m68k: gs: use tty_port fixes

2008-07-26 20:29:03 -07:00

ser_a2232.h

…

ser_a2232fw.ax

…

ser_a2232fw.h

…

serial167.c

…

snsc_event.c

…

snsc.c

…

snsc.h

…

sonypi.c

…

specialix_io8.h

…

specialix.c

…

stallion.c

stallion: removed unused variable

2008-07-24 10:47:30 -07:00

sx.c

sx: push BKL down into the firmware ioctl handler

2008-07-25 10:53:43 -07:00

sx.h

…

sxboards.h

…

sxwindow.h

…

synclink_gt.c

…

synclink.c

…

synclinkmp.c

…

sysrq.c

…

tb0219.c

…

tlclk.c

…

toshiba.c

…

tty_audit.c

…

tty_io.c

unexport proc_clear_tty

2008-07-25 10:53:44 -07:00

tty_ioctl.c

…

tty_ldisc.c

try harder to load tty ldisc driver

2008-08-01 12:50:15 -07:00

vc_screen.c

…

viocons.c

…

viotape.c

…

virtio_console.c

virtio_console: use virtqueue notification for hvc_console

2008-07-25 12:06:06 +10:00

vme_scc.c

m68k: gs: use tty_port fixes

2008-07-26 20:29:03 -07:00

vr41xx_giu.c

…

vt_ioctl.c

…

vt.c

vt: Deadlock workaround

2008-08-04 17:12:07 -07:00