diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-11-11 15:12:37 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-11-11 15:12:37 -0800 |
| commit | 76c80a9a04eab07a74f363a161e215679ba4eb5f (patch) | |
| tree | 2efad6dedb89761233c0d7013c95a224a844f86b /drivers/net/lib8390.c | |
| parent | e809f65e5aeff194a4e6570e9a5a5e40aa3abc96 (diff) | |
| parent | 9ec23a7f6d2537faf14368e066e307c06812c4ca (diff) | |
Merge branch 'upstream/core' into upstream/xen
* upstream/core: (3240 commits)
xen: do not release any memory under 1M in domain 0
xen: events: do not unmask event channels on resume
xen: correct size of level2_kernel_pgt
watchdog: iTCO_wdt.c: remove extra pci_dev_put()'s from init code
power: Revert "power_supply: Mark twl4030_charger as broken"
mfd: Fix a memory leak when unload mc13xxx-core module
mfd: Fix resource reclaim for max8998
mfd: Remove unneeded ret value checking for max8998 register updates
mfd: Add free max8998->ono irq in max8998_irq_exit()
mfd: Fix resource reclaim in pcf50633_remove()
omap4: pandaboard: fix up mmc card detect logic
mfd: Fix ezx_pcap_probe error path
mfd: Fix off-by-one value range checking for tps6507x
mfd: Remove __devinitdata from tc6393xb_mmc_resources
mfd: Add WM831x SPI support
mfd: Factor out WM831x I2C I/O from the core driver
mfd: Remove DEBUG defines from mc13xxx-core
mfd: Fix jz4740_adc_set_enabled
mfd: Add TPS658621C device ID
mfd: Fix twl-irq function declaration warnings
...
Diffstat (limited to 'drivers/net/lib8390.c')
0 files changed, 0 insertions, 0 deletions