David S. Miller 039a6f6a39 ucc_geth: Fix merge error. ...

I left a merge failure unresolved, noticed by Stephen
Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2009-03-23 16:21:16 -07:00

..

accessibility

…

acpi

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-02-24 03:50:29 -08:00

amba

…

ata

[libata] pata_legacy: for VLB 32bit PIO don't try tricks with slop

2009-02-25 15:30:23 -05:00

atm

atm: fix non-const printk argument

2009-03-21 19:06:51 -07:00

auxdisplay

…

base

PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix

2009-02-22 22:09:33 +01:00

block

net: convert usage of packet_type to read_mostly

2009-03-10 05:22:43 -07:00

bluetooth

Bluetooth: Remove some pointless conditionals before kfree_skb()

2009-02-27 06:14:50 +01:00

cdrom

…

char

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-02-24 03:50:29 -08:00

clocksource

…

connector

connector: create connector workqueue only while needed once

2009-02-02 23:22:04 -08:00

cpufreq

[CPUFREQ] Make ignore_nice_load setting of ondemand work as expected.

2009-02-05 12:25:26 -05:00

cpuidle

…

crypto

crypto: ixp4xx - Fix qmgr_request_queue build failure

2009-03-04 08:01:22 +08:00

dca

dca: add missing copyright/license headers

2009-03-21 13:31:23 -07:00

dio

…

dma

[ARM] fix lots of ARM __devexit sillyness

2009-03-03 21:04:04 +00:00

edac

powerpc: More printing warning fixes for the l64 to ll64 conversion

2009-01-28 17:15:52 +11:00

eisa

…

firewire

firewire: core: Remove card from list of cards when enable fails

2009-02-01 11:17:24 +01:00

firmware

Bernhard has moved

2009-02-18 15:37:56 -08:00

gpio

gpiolib: fix request related issue

2009-01-29 18:04:43 -08:00

gpu

drm: fix double lock typo

2009-03-04 21:49:14 +10:00

hid

HID: move tmff and zpff devices from ignore_list to blacklist

2009-02-17 13:25:01 +01:00

hwmon

lis3lv02d: add axes knowledge of HP Pavilion dv5 models

2009-02-18 15:37:54 -08:00

i2c

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2009-03-03 14:12:41 -08:00

ide

ide: fix refcounting in device drivers

2009-02-25 20:28:24 +01:00

idle

…

ieee1394

Make ieee1394_init a fs-initcall

2009-02-26 10:32:31 -08:00

infiniband

infiniband: convert ipoib to net_device_ops

2009-03-21 19:19:14 -07:00

input

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

2009-03-02 15:43:03 -08:00

isdn

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

2009-03-20 02:27:41 -07:00

leds

…

lguest

lguest: Fix a memory leak with the lg object during launcher close

2009-01-30 11:34:11 +10:30

macintosh

…

mca

…

md

md: avoid races when stopping resync.

2009-02-25 13:18:47 +11:00

media

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

2009-03-02 15:43:03 -08:00

memstick

…

message

[SCSI] mpt: fix disable lsi sas to use msi as default

2009-02-22 08:51:07 -06:00

mfd

mfd: Fix sm501_register_gpio section mismatch

2009-02-17 09:48:05 +01:00

misc

hpilo: new pci device

2009-02-27 16:26:22 -08:00

mmc

sdhci: Add NO_BUSY_IRQ quirk for Marvell CAFE host chip

2009-03-02 21:48:20 +01:00

mtd

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2009-03-03 14:12:41 -08:00

net

ucc_geth: Fix merge error.

2009-03-23 16:21:16 -07:00

nubus

…

of

…

oprofile

…

parisc

Documentation: move DMA-mapping.txt to Doc/PCI/

2009-01-29 18:19:29 -08:00

parport

m68k: atari - Rename "mfp" to "st_mfp"

2009-02-22 09:23:02 -08:00

pci

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

2009-02-26 14:43:42 -08:00

pcmcia

…

platform

fujitsu-laptop: Use RFKILL support bitmask from firmware

2009-02-21 21:59:55 -05:00

pnp

…

power

pcf50633_charger: Fix typo

2009-02-02 19:53:02 +03:00

ps3

…

rapidio

…

regulator

leds: Fix bounds checking of wm8350->pmic.led

2009-01-30 21:50:49 +00:00

rtc

rtc: t reaches -1, tested 0

2009-02-11 14:25:36 -08:00

s390

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-02-24 03:50:29 -08:00

sbus

…

scsi

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

2009-03-05 02:06:47 -08:00

serial

Merge branch 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2009-02-27 16:40:00 -08:00

sh

…

sn

…

spi

spi-gpio: sanitize MISO bitvalue

2009-02-18 15:37:56 -08:00

ssb

ssb: Add SPROM fallback support

2009-03-05 14:39:32 -05:00

staging

Staging: w35und: fix usb_control_msg() error handling in wb35_probe()

2009-02-27 12:56:24 -08:00

tc

…

telephony

…

thermal

…

uio

…

usb

usbnet: convert rndis driver to use dev_get_stats

2009-03-21 19:55:34 -07:00

uwb

…

video

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

2009-03-05 02:06:47 -08:00

virtio

virtio-pci: do not oops on config change if driver not loaded

2009-02-02 19:17:56 -08:00

w1

w1: add missing Kconfig/Makefile entries for DS2431 slave driver

2009-02-27 16:26:21 -08:00

watchdog

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2009-02-19 09:52:12 -08:00

xen

PM: Split up sysdev_[suspend|resume] from device_power_[down|up]

2009-02-22 10:33:44 -08:00

zorro

…

Kconfig

…

Makefile

…