summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/rndis_host.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-08 16:44:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-08 16:44:53 +0200
commit0a2851b9a837cb025d48bb8118f35ebd12bce4b5 (patch)
tree5d836783b18a51c74e3e643aeef036dce31b543b /drivers/net/usb/rndis_host.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff)
parentMerge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480... (diff)
downloadlinux-0a2851b9a837cb025d48bb8118f35ebd12bce4b5.tar.xz
linux-0a2851b9a837cb025d48bb8118f35ebd12bce4b5.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI / PM: Move ACPI video resume to a PM notifier ACPI: Reduce ACPI resource conflict message to KERN_WARNING, printk cleanup ACPI: battery drivers should call power_supply_changed() ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n PNPACPI: truncate _CRS windows with _LEN > _MAX - _MIN + 1 ACPI: Don't send KEY_UNKNOWN for random video notifications ACPI: NUMA: map pxms to low node ids ACPI: use _HID when supplied by root-level devices ACPI / ACPICA: Do not check reference counters in acpi_ev_enable_gpe() ACPI: fixes a false alarm from lockdep ACPI dock: support multiple ACPI dock devices ACPI: EC: Allow multibyte access to EC
Diffstat (limited to 'drivers/net/usb/rndis_host.c')
0 files changed, 0 insertions, 0 deletions