Guennadi Liakhovetski a79aebfca1 sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge ...

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2009-09-25 13:36:51 +09:00

..

accessibility

…

acpi

Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

2009-09-24 10:30:41 -07:00

amba

Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel

2009-09-12 12:01:34 +01:00

ata

trivial: fix comment typo in drivers/ata/pata_hpt37x.c

2009-09-21 15:15:53 +02:00

atm

…

auxdisplay

…

base

mm: oom analysis: add shmem vmstat

2009-09-22 07:17:27 -07:00

block

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

2009-09-23 09:23:45 -07:00

bluetooth

pcmcia: dtl1_cs: fix pcmcia_loop_config logic

2009-09-15 10:17:16 -07:00

cdrom

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

char

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2009-09-24 17:22:31 -07:00

clocksource

…

connector

proc connector: add event for process becoming session leader

2009-09-23 07:39:29 -07:00

cpufreq

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

2009-09-18 09:16:57 -07:00

cpuidle

cpuidle: menu governor: reduce latency on exit

2009-09-22 07:17:45 -07:00

crypto

…

dca

dca: module load should not be an error message

2009-09-13 10:27:04 -07:00

dio

…

dma

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into for-linus

2009-09-23 18:31:11 +10:00

edac

edac: core: remove completion-wait for complete with rcu_barrier

2009-09-24 07:21:05 -07:00

eisa

…

firewire

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

2009-09-23 09:43:22 -07:00

firmware

mm: don't use alloc_bootmem_low() where not strictly needed

2009-09-22 07:17:38 -07:00

gpio

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

2009-09-23 09:30:48 -07:00

gpu

Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

2009-09-24 10:30:41 -07:00

hid

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

2009-09-22 07:51:28 -07:00

hwmon

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

2009-09-23 15:20:16 -07:00

i2c

Merge branch 'origin' into for-linus

2009-09-24 21:22:33 +01:00

ide

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

2009-09-23 09:32:11 -07:00

idle

ioat: switch watchdog and reset handler from workqueue to timer

2009-09-08 17:30:24 -07:00

ieee1394

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

2009-09-23 09:43:22 -07:00

ieee802154

netdev: convert bulk of drivers to netdev_tx_t

2009-09-01 01:14:07 -07:00

infiniband

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

2009-09-24 17:06:01 -07:00

input

input: fix build failures caused by Kconfig Winbond WPCD376I Consumer IR hardware driver Kconfig entry

2009-09-24 07:20:56 -07:00

isdn

seq_file: constify seq_operations

2009-09-23 07:39:29 -07:00

leds

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

2009-09-23 15:39:36 -07:00

lguest

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

2009-09-23 09:23:45 -07:00

macintosh

trivial: remove unnecessary semicolons

2009-09-21 15:14:58 +02:00

mca

…

md

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into for-linus

2009-09-23 18:31:11 +10:00

media

sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge

2009-09-25 13:36:51 +09:00

memstick

memstick: move dev_dbg

2009-09-24 07:21:05 -07:00

message

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

2009-09-22 07:51:45 -07:00

mfd

mfd/gpio: add a GPIO interface to the UCB1400 MFD chip driver via gpiolib

2009-09-23 07:39:48 -07:00

misc

gru: allocation may fail in quicktest1()

2009-09-24 07:21:05 -07:00

mmc

Merge branch 'origin' into for-linus

2009-09-24 21:22:33 +01:00

mtd

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

2009-09-24 09:01:44 -07:00

net

Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

2009-09-24 17:08:56 -07:00

nubus

…

of

of: remove "stm,m25p40" alias

2009-09-23 07:39:43 -07:00

oprofile

cpumask: use zalloc_cpumask_var() where possible

2009-09-24 09:34:24 +09:30

parisc

mm: replace various uses of num_physpages by totalram_pages

2009-09-22 07:17:38 -07:00

parport

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

pci

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

2009-09-24 09:57:08 -07:00

pcmcia

Merge branch 'origin' into for-linus

2009-09-24 21:22:33 +01:00

platform

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

2009-09-23 15:39:36 -07:00

pnp

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

2009-09-23 09:32:11 -07:00

power

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

2009-09-23 03:49:27 +04:00

pps

…

ps3

powerpc/ps3: Workaround for flash memory I/O error

2009-09-11 11:28:00 +10:00

rapidio

…

regulator

regulator: fix voltage range in da9034 ldo12

2009-09-22 13:58:23 +01:00

rtc

Merge branch 'origin' into for-linus

2009-09-24 21:22:33 +01:00

s390

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

sbus

const: make block_device_operations const

2009-09-22 07:17:25 -07:00

scsi

seq_file: constify seq_operations

2009-09-23 07:39:29 -07:00

serial

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2009-09-24 17:22:31 -07:00

sfi

SFI: remove unneeded includes

2009-09-15 15:08:40 -04:00

sh

sh: Fix up simplified multi-evt handling under sparseirq.

2009-08-31 15:15:33 +09:00

sn

…

spi

Merge branch 'origin' into for-linus

2009-09-24 21:22:33 +01:00

ssb

ssb/sdio: fix printk format warnings

2009-09-16 16:21:00 -04:00

staging

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2009-09-24 07:54:16 -07:00

tc

…

telephony

…

thermal

thermal: add missing Kconfig dependency

2009-09-19 01:41:49 -04:00

uio

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2009-09-18 09:43:09 -07:00

usb

Merge branch 'origin' into for-linus

2009-09-24 21:22:33 +01:00

uwb

trivial: remove unnecessary semicolons

2009-09-21 15:14:58 +02:00

video

Merge branch 'origin' into for-linus

2009-09-24 21:22:33 +01:00

virtio

virtio: add virtio IDs file

2009-09-23 22:26:32 +09:30

vlynq

drivers/vlynq/vlynq.c: fix resource size off by 1 error

2009-09-24 07:21:05 -07:00

w1

…

watchdog

[WATCHDOG] sizeof cleanup

2009-09-18 08:39:37 +00:00

xen

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

2009-09-22 07:51:45 -07:00

zorro

…

Kconfig

…

Makefile

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

2009-09-23 10:07:49 -07:00