diff options
author | Linus Torvalds | 2009-04-17 22:51:14 +0200 |
---|---|---|
committer | Linus Torvalds | 2009-04-17 22:51:14 +0200 |
commit | 7217fa9851c99ffe43cee9e3ba4b81a34ce7bac4 (patch) | |
tree | 433a1e585e9a2ceebd6bd648896c9328de4b4f75 /drivers/net/pasemi_mac_ethtool.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
parent | Merge branch 'defconfig-s3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
download | kernel-qcow2-linux-7217fa9851c99ffe43cee9e3ba4b81a34ce7bac4.tar.gz kernel-qcow2-linux-7217fa9851c99ffe43cee9e3ba4b81a34ce7bac4.tar.xz kernel-qcow2-linux-7217fa9851c99ffe43cee9e3ba4b81a34ce7bac4.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (48 commits)
[ARM] S3C24XX: ADC: Check pending queue before freeing adc client
[ARM] S3C: Fix ADC driver sparse warning
[ARM] Osiris: Fix double initialisation in machine block
[ARM] Anubis: Fix sparse warnings for items that should be static
[ARM] JIVE: Fix sparse warnings about items which should be static
[ARM] S3C: Fix sparse warning from missing 's3c_device_hwmon'
[ARM] S3C24XX: Fix sparse error in gpiolib.c
[ARM] 5455/1: Fix IRQ noise from VIC code
[ARM] 5454/1: ep93xx_eth: fix sparse warnings
[ARM] remove .gitignore from include/asm-arm
Update MAINTAINERS
mxc defconfig updates
mx31ads: Mark as having full regulatoion constraints with 1133-EV1 board
mx31ads: Depend on all the WM8350 core dependencies for WM1133-EV1 board
Fix ifdef in plat-mxc/irc.c
MX1ADS: remove I2C ifdefs
qong: remove AIPS[12] mappings from machine-specific iotable
mx31ads: imoux pins should be passed in as unsigned int
MXC: remove orphan imx_init_uart() definition
mx31: pin definition for csi
...
Diffstat (limited to 'drivers/net/pasemi_mac_ethtool.c')
0 files changed, 0 insertions, 0 deletions