diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 18:41:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 18:41:51 -0800 |
| commit | 94f5a00d7c37ef8a3f85f8ea29903d4bf2291664 (patch) | |
| tree | c25b765601b7b96049736bee8cb4b4da9e751d52 /drivers/power/apm_power.c | |
| parent | eab99d9b97d136ddfd66af66e0536a58195b3040 (diff) | |
| parent | b334349eb4c8562fd60bc8a8bd5ba6b42f22b8ac (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sis190: scheduling while atomic error
sis190: mdio operation failure is not correctly detected
sis190: remove duplicate INIT_WORK
sis190: add cmos ram access code for the SiS19x/968 chipset pair
[INET]: Fix truesize setting in ip_append_data
[NETNS]: Re-export init_net via EXPORT_SYMBOL.
iwlwifi: fix possible read attempt on ucode that is not available
[IPV4]: Add missing skb->truesize increment in ip_append_page().
[TULIP] DMFE: Fix SROM parsing regression.
[BLUETOOTH]: Move children of connection device to NULL before connection down.
Diffstat (limited to 'drivers/power/apm_power.c')
0 files changed, 0 insertions, 0 deletions