Alan Cox 1aa3692da5 ttydev: Fix up compile failures in the PPC build ...

Fix up a couple of reported merge problems

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2008-07-22 13:03:22 -07:00

..

accessibility

…

acpi

APCI: revert another duplicated patch

2008-07-20 17:14:57 -07:00

amba

…

ata

Merge commit 'origin/master'

2008-07-16 11:07:59 +10:00

atm

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-18 02:39:39 -07:00

auxdisplay

…

base

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2008-07-16 17:25:46 -07:00

block

m68k: Return -ENODEV if no device is found

2008-07-20 17:24:38 -07:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-07-20 17:43:29 -07:00

cdrom

…

char

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

2008-07-21 14:55:23 -07:00

clocksource

Fix printk format warning in clocksource/acpi_pm.c

2008-07-15 11:01:39 -07:00

connector

…

cpufreq

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

2008-07-21 15:10:37 -07:00

cpuidle

…

crypto

…

dca

…

dio

dio: use dio_match_device() in dio_bus_match()

2008-07-20 17:24:40 -07:00

dma

…

edac

…

eisa

…

firewire

Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2008-07-15 12:39:44 -07:00

firmware

…

gpio

gpio: pcf857x: add lock and handle more chips

2008-07-22 09:59:41 -07:00

gpu

…

hid

USB: fix usb_reset_device and usb_reset_composite_device(take 3)

2008-07-21 15:16:33 -07:00

hwmon

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

2008-07-21 00:55:14 -04:00

i2c

i2c: Convert the max6875 driver to a new-style i2c driver

2008-07-16 19:30:07 +02:00

ide

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

2008-07-17 10:55:07 -07:00

ieee1394

Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2008-07-15 12:39:44 -07:00

infiniband

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-18 02:39:39 -07:00

input

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

2008-07-21 00:55:14 -04:00

isdn

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-07-20 17:43:29 -07:00

leds

…

lguest

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

macintosh

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

2008-07-21 00:55:14 -04:00

mca

…

md

Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

2008-07-21 10:30:10 -07:00

media

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

2008-07-20 21:14:42 -07:00

memstick

…

message

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2008-07-15 18:58:04 -07:00

mfd

mfd: let asic3 use mem resource instead of bus_shift

2008-07-20 19:56:44 +02:00

misc

fujitsu-laptop: depends on INPUT

2008-07-16 23:27:03 +02:00

mmc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

2008-07-16 15:17:52 -07:00

mtd

[MIPS] MTX-1 flash partition setup move to platform devices registration

2008-07-15 18:44:38 +01:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-07-21 11:29:52 -07:00

nubus

…

of

…

oprofile

…

parisc

…

parport

…

pci

pci kernel-doc fatal error

2008-07-21 10:43:26 -07:00

pcmcia

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

2008-07-17 10:55:07 -07:00

pnp

PNPACPI: add support for HP vendor-specific CCSR descriptors

2008-07-16 23:27:07 +02:00

power

…

ps3

…

rapidio

…

rtc

…

s390

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-18 02:39:39 -07:00

sbus

drivers/sbus/: cleanups

2008-07-17 21:38:17 -07:00

scsi

scsi_dh: Verify "dev" is a sdev before accessing it.

2008-07-16 17:54:21 -07:00

serial

ttydev: Fix up compile failures in the PPC build

2008-07-22 13:03:22 -07:00

sh

…

sn

…

spi

…

ssb

…

tc

…

telephony

…

thermal

…

uio

…

usb

usb-storage: revert DMA-alignment change for Wireless USB

2008-07-21 15:16:51 -07:00

video

export c2p

2008-07-20 17:24:39 -07:00

virtio

…

w1

w1/ds2482: Convert to a new-style driver

2008-07-16 19:30:07 +02:00

watchdog

Merge commit 'origin/master'

2008-07-16 11:07:59 +10:00

xen

Merge branch 'x86/paravirt-spinlocks' into x86/for-linus

2008-07-21 16:45:56 +02:00

zorro

zorro: use memory_read_from_buffer

2008-07-20 17:24:38 -07:00

Kconfig

…

Makefile

gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.

2008-07-21 08:42:49 +10:00