Russell King
07555c9880
OMAP: enable smc911x support for LDP platform ...
The following patch enables SMC911x support to work on the OMAP LDP
board. Although the SMC911x driver will eventually be obsoleted, the
smsc911x patches are rather invasive for the -rc kernels.
Rather than risk destablising smsc911x, this simpler patch is preferred
to allow the network interface to work.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-03-02 22:29:37 -08:00
Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' and 'suspend' into release
2009-02-21 22:01:43 -05:00
[ARM] Fix realview build
2009-01-08 16:29:41 +00:00
[libata] pata_legacy: for VLB 32bit PIO don't try tricks with slop
2009-02-25 15:30:23 -05:00
ATM: misplaced parentheses?
2009-02-18 17:41:38 -08:00
PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix
2009-02-22 22:09:33 +01:00
xen/blkfront: use blk_rq_map_sg to generate ring entries
2009-02-26 10:45:48 +01:00
m68k: atari - Rename "mfp" to "st_mfp"
2009-02-22 09:23:02 -08:00
[CPUFREQ] Make ignore_nice_load setting of ondemand work as expected.
2009-02-05 12:25:26 -05:00
dca: redesign locks to fix deadlocks
2009-02-02 23:26:57 -08:00
m68k: dio - Kill resource_size_t format warnings
2009-01-12 20:56:42 +01:00
atmel-mci: fix initialization of dma slave data
2009-02-18 15:37:55 -08:00
powerpc: More printing warning fixes for the l64 to ll64 conversion
2009-01-28 17:15:52 +11:00
firewire: core: Remove card from list of cards when enable fails
2009-02-01 11:17:24 +01:00
Bernhard has moved
2009-02-18 15:37:56 -08:00
gpiolib: fix request related issue
2009-01-29 18:04:43 -08:00
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-02-27 16:43:05 -08:00
HID: move tmff and zpff devices from ignore_list to blacklist
2009-02-17 13:25:01 +01:00
lis3lv02d: add axes knowledge of HP Pavilion dv5 models
2009-02-18 15:37:54 -08:00
Add i2c_board_info for RiscPC PCF8583
2009-02-24 19:19:50 +01:00
ide: fix refcounting in device drivers
2009-02-25 20:28:24 +01:00
i7300_idle: struct device - replace bus_id with dev_name(), dev_set_name()
2009-01-06 10:44:39 -08:00
Make ieee1394_init a fs-initcall
2009-02-26 10:32:31 -08:00
Merge branches 'ehca', 'ipoib' and 'mlx4' into for-linus
2009-01-16 15:05:54 -08:00
input: PCF50633 input driver
2009-01-11 01:34:25 +01:00
ISDN: fix sc/shmem printk format warning
2009-02-20 00:54:44 -08:00
lis3lv02d: merge with leds hp disk
2009-01-15 16:39:40 -08:00
lguest: Fix a memory leak with the lg object during launcher close
2009-01-30 11:34:11 +10:30
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-01-07 11:31:52 -08:00
md: avoid races when stopping resync.
2009-02-25 13:18:47 +11:00
V4L/DVB (10694): [PATCH] software IRQ watchdog for Flexcop B2C2 DVB PCI cards
2009-02-26 22:29:18 -03:00
memstick: annotate endianness of attribute structs
2009-01-09 16:54:41 -08:00
[SCSI] mpt fusion: Add Firmware debug support
2009-01-13 10:36:02 -06:00
mfd: Fix sm501_register_gpio section mismatch
2009-02-17 09:48:05 +01:00
hpilo: new pci device
2009-02-27 16:26:22 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
2009-02-18 17:55:15 -08:00
Merge git://git.infradead.org/mtd-2.6
2009-02-26 14:45:57 -08:00
OMAP: enable smc911x support for LDP platform
2009-03-02 22:29:37 -08:00
drivers/of: Add the of_find_i2c_device_by_node function.
2009-01-09 15:49:06 -07:00
oprofile: fix uninitialized use of struct op_entry
2009-01-17 17:26:39 +01:00
Documentation: move DMA-mapping.txt to Doc/PCI/
2009-01-29 18:19:29 -08:00
m68k: atari - Rename "mfp" to "st_mfp"
2009-02-22 09:23:02 -08:00
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
powerpc: Change u64/s64 to a long long integer type
2009-01-13 14:47:59 +11:00
fujitsu-laptop: Use RFKILL support bitmask from firmware
2009-02-21 21:59:55 -05:00
Merge branch 'linus' into release
2009-01-09 03:39:43 -05:00
pcf50633_charger: Fix typo
2009-02-02 19:53:02 +03:00
powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3
2009-01-16 16:15:14 +11:00
rapidio: remove excess kernel-doc notation
2009-01-06 15:59:28 -08:00
leds: Fix bounds checking of wm8350->pmic.led
2009-01-30 21:50:49 +00:00
rtc: t reaches -1, tested 0
2009-02-11 14:25:36 -08:00
[S390] fix "mem=" handling in case of standby memory
2009-02-19 15:19:19 +01:00
sparc64: Fix unsigned long long warnings in drivers.
2009-01-06 13:20:38 -08:00
[SCSI] qla2xxx: Update version number to 8.03.00-k3.
2009-02-10 11:15:20 -05:00
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
spi-gpio: sanitize MISO bitvalue
2009-02-18 15:37:56 -08:00
Staging: w35und: fix usb_control_msg() error handling in wb35_probe()
2009-02-27 12:56:24 -08:00
thermal: struct device - replace bus_id with dev_name(), dev_set_name()
2009-01-06 10:44:37 -08:00
UIO: Pass information about ioports to userspace (V2)
2009-01-06 10:44:44 -08:00
USB: musb: fix srp sysfs entry deletion
2009-02-27 14:40:51 -08:00
uwb: lock rc->rsvs_lock with spin_lock_bh()
2009-01-23 12:57:20 +00:00
m68k: atari - Rename "mfp" to "st_mfp"
2009-02-22 09:23:02 -08:00
virtio-pci: do not oops on config change if driver not loaded
2009-02-02 19:17:56 -08:00
w1: add missing Kconfig/Makefile entries for DS2431 slave driver
2009-02-27 16:26:21 -08:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2009-02-19 09:52:12 -08:00
PM: Split up sysdev_[suspend|resume] from device_power_[down|up]
2009-02-22 10:33:44 -08:00
m68k: zorro - Use %pR to print resources
2009-01-12 20:56:43 +01:00
Merge branch 'drivers-platform' into release
2009-01-09 04:56:56 -05:00
07555c9880