Linus Torvalds 45c091bb2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc ...

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h

2006-06-22 22:11:30 -07:00

..

agp

[PATCH] x86_64: use select for GART_IOMMU to enable AGP

2006-06-22 15:05:58 -07:00

drm

drm: possible cleanups

2006-04-23 18:26:40 +10:00

ftape

drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment

2006-03-26 19:18:07 +02:00

ip2

Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2006-02-03 23:49:49 +01:00

ipmi

[PATCH] IPMI: reserve I/O ports separately

2006-05-31 16:27:10 -07:00

mwave

[PATCH] fix array overrun in drivers/char/mwave/mwavedd.c

2006-04-28 08:33:46 -07:00

pcmcia

[PATCH] pcmcia: fix zeroing of cm4000_cs.c data

2006-06-02 00:57:31 +02:00

rio

[PATCH] missing readb/readw in rio

2006-05-27 02:27:23 -04:00

tpm

[PATCH] tpm: more bios log parsing fixes

2006-05-31 16:27:10 -07:00

watchdog

[WATCHDOG] s3c2410_wdt.c stop watchdog after boot

2006-05-15 21:38:14 +02:00

.gitignore

gitignore: misc files

2006-01-01 22:21:50 +01:00

amiserial.c

[PATCH] kill _INLINE_

2006-03-23 07:38:16 -08:00

applicom.c

[PATCH] Wrong out of range check in drivers/char/applicom.c

2006-04-11 06:18:46 -07:00

applicom.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cd1865.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ChangeLog

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

consolemap.c

[PATCH] kfree cleanup: drivers/char

2005-11-07 07:54:02 -08:00

cp437.uni

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cs5535_gpio.c

[PATCH] cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups

2006-04-20 07:54:03 -07:00

cyclades.c

[PATCH] new tty buffering locking fix

2006-02-03 08:32:09 -08:00

decserial.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

defkeymap.c_shipped

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

defkeymap.map

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

digi1.h

[PATCH] Clean up the old digi support and rescue it

2005-09-07 16:57:20 -07:00

digi.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

digiFep1.h

[PATCH] Clean up the old digi support and rescue it

2005-09-07 16:57:20 -07:00

digiPCI.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ds1286.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ds1302.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ds1620.c

[PATCH] char/ds1620: use msleep() instead of schedule_timeout()

2005-06-25 16:24:57 -07:00

dsp56k.c

[PATCH] m68k: dsp56k __user annotations

2006-01-12 09:09:04 -08:00

dtlk.c

[PATCH] Remove extraneous \n in doubletalk init printk.

2006-04-11 06:18:41 -07:00

ec3104_keyb.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

efirtc.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

epca.c

BUG_ON() Conversion in drivers/char

2006-03-26 18:17:21 +02:00

epca.h

[PATCH] epca iomem annotations + several missing readw()

2005-09-16 10:38:10 -07:00

epcaconfig.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

esp.c

[PATCH] Fix locking error in esp

2006-02-14 10:01:39 -08:00

generic_nvram.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

generic_serial.c

[PATCH] sem2mutex: serial ->port_write_mutex

2006-03-23 07:38:14 -08:00

genrtc.c

[PATCH] genrtc: fix read on 64-bit platforms

2006-05-01 18:17:47 -07:00

hangcheck-timer.c

[PATCH] s390: hangcheck timer support

2006-02-01 08:53:24 -08:00

hpet.c

[PATCH] HPET: handle multiple ACPI EXTENDED_IRQ resources

2006-02-14 16:09:34 -08:00

hvc_console.c

[PATCH] powerpc: Make rtas console _much_ faster

2006-06-09 21:24:18 +10:00

hvc_console.h

[PATCH] powerpc: hvc_console updates

2006-03-28 16:45:26 +11:00

hvc_rtas.c

[PATCH] powerpc: Cleanup hvc_rtas.c a little

2006-06-09 21:24:20 +10:00

hvc_vio.c

[PATCH] powerpc: hvc_console updates

2006-03-28 16:45:26 +11:00

hvcs.c

[PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS

2006-04-01 22:36:57 +11:00

hvsi.c

[PATCH] powerpc: Quiet HVSI boot output

2006-04-22 18:45:07 +10:00

hw_random.c

[PATCH] Add missing ifdef for VIA RNG code

2006-03-03 21:05:58 -05:00

i8k.c

[PATCH] I8K: fix /proc reporting of blank service tags

2005-11-12 11:42:32 -08:00

ip27-rtc.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

isicom.c

[PATCH] char/isicom: More whitespaces and coding style

2006-01-10 08:02:01 -08:00

istallion.c

[PATCH] drivers/char/[i]stallion: Clean up kmalloc usage

2006-03-31 12:18:56 -08:00

ite_gpio.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Kconfig

[PATCH] Final rio polish

2006-05-15 11:20:57 -07:00

keyboard.c

Input: allow using several chords for braille

2006-04-26 00:14:10 -04:00

lcd.c

Resurrect Cobalt support for 2.6.

2005-10-29 19:30:42 +01:00

lcd.h

Resurrect Cobalt support for 2.6.

2005-10-29 19:30:42 +01:00

lp.c

[PATCH] Driver Core: fix up all callers of class_device_create()

2005-10-28 09:52:52 -07:00

Makefile

[PATCH] powerpc: console_initcall ordering issues

2006-06-10 11:02:05 -07:00

mbcs.c

[IA64] mbcs_init() should give up unless running on sn2

2005-10-04 09:39:18 -07:00

mbcs.h

[PATCH] mbcs trivial user annotations

2005-05-04 07:33:13 -07:00

mem.c

[PATCH] splice: add ->splice_write support for /dev/null

2006-04-26 14:40:08 +02:00

misc.c

[PATCH] mark f_ops const in the inode

2006-03-28 09:16:05 -08:00

mmtimer.c

[IA64] SGI SN drivers: don't report !sn2 hardware as an error

2006-03-07 15:27:59 -08:00

moxa.c

[PATCH] moxa serial: add proper capability check

2006-01-10 09:45:36 -08:00

mxser.c

[PATCH] Remove MODULE_PARM

2006-03-25 08:22:52 -08:00

mxser.h

[PATCH] Typo fixes

2006-03-28 09:16:08 -08:00

n_hdlc.c

[PATCH] n_hdlc.c: remove unused declaration

2006-01-10 08:02:00 -08:00

n_r3964.c

[PATCH] TTY layer buffering revamp

2006-01-10 08:01:59 -08:00

n_tty.c

[PATCH] Fix for the PPTP hangs that have been reported

2006-06-11 20:40:39 -07:00

nvram.c

[PATCH] drivers/char: Use ARRAY_SIZE macro

2006-01-10 08:01:56 -08:00

nwbutton.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nwbutton.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nwflash.c

[PATCH] sem2mutex: drivers/char/

2006-03-23 07:38:11 -08:00

ppdev.c

[PATCH] parport: move PP_MAJOR from ppdev.h to major.h

2006-03-25 08:22:53 -08:00

pty.c

[PATCH] TTY layer buffering revamp

2006-01-10 08:01:59 -08:00

qtronix.c

qtronix.c: Handle kmalloc failure.

2005-10-29 19:30:55 +01:00

qtronixmap.c_shipped

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

qtronixmap.map

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

random.c

[IPV6]: Unexport secure_ipv6_port_ephemeral

2006-04-09 22:29:17 -07:00

raw.c

[PATCH] sem2mutex: drivers: raw, connector, dcdbas, ppp_generic

2006-03-23 07:38:10 -08:00

riscom8_reg.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

riscom8.c

[PATCH] Remove MODULE_PARM

2006-03-25 08:22:52 -08:00

riscom8.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rocket_int.h

[PATCH] drivers/char/rocket.c: cleanups

2005-06-25 16:25:04 -07:00

rocket.c

[PATCH] Fix RocketPort driver

2006-02-03 08:31:59 -08:00

rocket.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rtc.c

[SPARC]: Kill __irq_itoa().

2006-06-20 01:21:29 -07:00

s3c2410-rtc.c

[PATCH] handle errors returned by platform_get_irq*()

2006-03-20 13:42:57 -08:00

scan_keyb.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

scan_keyb.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

scc.h

[PATCH] m68k: static vs. extern in scc.h

2006-01-12 09:09:00 -08:00

scx200_gpio.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

selection.c

[PATCH] TTY layer buffering revamp

2006-01-10 08:01:59 -08:00

ser_a2232.c

[PATCH] sem2mutex: serial ->port_write_mutex

2006-03-23 07:38:14 -08:00

ser_a2232.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ser_a2232fw.ax

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ser_a2232fw.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

serial167.c

[PATCH] remove unused tmp_buf_sem's

2006-01-14 10:41:42 -08:00

snsc_event.c

[PATCH] snsc kmalloc2kzalloc

2006-03-23 07:38:15 -08:00

snsc.c

[PATCH] Altix snsc: duplicate kobject fix

2006-04-22 09:19:53 -07:00

snsc.h

[IA64-SGI] Handle SC env. powerdown events

2006-01-26 13:32:26 -08:00

sonypi.c

[PATCH] sonypi: correct detection of new ICH7-based laptops

2006-04-20 07:54:04 -07:00

specialix_io8.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

specialix.c

[PATCH] remove unused tmp_buf_sem's

2006-01-14 10:41:42 -08:00

stallion.c

[PATCH] drivers/char/[i]stallion: Clean up kmalloc usage

2006-03-31 12:18:56 -08:00

sx.c

[PATCH] sem2mutex: serial ->port_write_mutex

2006-03-23 07:38:14 -08:00

sx.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sxboards.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sxwindow.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

synclink_gt.c

[PATCH] synclink_gt: remove uneeded async code

2006-03-28 09:16:02 -08:00

synclink.c

[PATCH] Typo fixes

2006-03-28 09:16:08 -08:00

synclinkmp.c

[PATCH] s/;;/;/g

2006-03-24 07:33:24 -08:00

sysrq.c

[PATCH] sysrq cleanup

2006-03-25 08:22:52 -08:00

tb0219.c

[PATCH] tb0219: convert to the new platform device interface

2006-03-22 07:53:56 -08:00

tipar.c

[PATCH] tipar oops fix

2006-04-28 08:33:46 -07:00

tlclk.c

[PATCH] MPBL0010 driver sysfs permissions wide open

2006-04-11 06:18:43 -07:00

toshiba.c

[PATCH] remove ISA legacy functions: drivers/char/toshiba.c

2006-03-24 07:33:19 -08:00

tty_io.c

[PATCH] TTY: return class device pointer from tty_register_device()

2006-06-21 12:40:47 -07:00

tty_ioctl.c

[PATCH] coverity: tty_ldisc_ref return null check

2005-06-28 21:20:34 -07:00

vc_screen.c

[PATCH] fix ia64 compile failure with gcc4.1

2005-12-29 10:19:21 -08:00

viocons.c

[PATCH] powerpc: remove bitfields from HvLpEvent

2006-01-12 20:09:29 +11:00

viotape.c

[PATCH] powerpc: update iSeries viocd and viotape device-tree

2006-05-19 14:35:31 +10:00

vme_scc.c

[PATCH] sem2mutex: serial ->port_write_mutex

2006-03-23 07:38:14 -08:00

vr41xx_giu.c

[PATCH] vr41xx: convert to the new platform device interface

2006-03-22 07:53:56 -08:00

vt_ioctl.c

[PATCH] Only disallow _setting_ of function key string

2005-11-07 07:53:39 -08:00

vt.c

[PATCH] revert "swsusp add check for suspension of X controlled devices"

2006-05-31 16:27:11 -07:00