2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
linux-next/drivers/platform/x86
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -07:00
..
acer-wmi.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-03-18 10:37:40 -07:00
acerhdf.c acerhdf: fix resource reclaim in error path 2010-08-03 09:49:01 -04:00
asus_acpi.c platform: x86: asus_acpi: world-writable procfs files 2011-02-21 17:06:14 -05:00
asus-laptop.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
classmate-laptop.c classmate-laptop: add missing input_sync call 2011-01-07 17:03:41 -05:00
compal-laptop.c Support KHLB2 in the compal laptop driver 2011-01-07 17:29:44 -05:00
dell-laptop.c dell-laptop: Toggle the unsupported hardware killswitch 2011-02-21 17:06:21 -05:00
dell-wmi.c Input: dell-wmi - switch to using sparse keymap library 2010-10-21 09:36:43 -04:00
eeepc-laptop.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
eeepc-wmi.c eeepc-wmi: never load if legacy device is enabled 2011-01-07 17:03:44 -05:00
fujitsu-laptop.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2011-01-13 20:15:35 -08:00
hdaps.c Move hdaps driver to platform/x86 2010-10-21 10:10:43 -04:00
hp-wmi.c ACPI, hp-wmi: Fix memory leak in acpi query 2010-11-24 12:07:10 -05:00
ibm_rtl.c ibm_rtl: _RTL_ is not available in UEFI mode 2010-11-24 12:00:03 -05:00
ideapad-laptop.c ideapad: pass ideapad_priv as argument (part 2) 2011-01-07 17:03:47 -05:00
intel_ips.c intel_ips: fix sparse non-ANSI function warning 2011-01-10 11:55:25 -05:00
intel_ips.h drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915. 2010-12-23 09:51:36 +00:00
intel_menlow.c intel_menlow: fix memory leaks in error path 2010-08-03 09:48:40 -04:00
intel_pmic_gpio.c platform-drivers: x86: pmic: Use request_irq instead of chained handler 2011-02-21 17:06:11 -05:00
intel_rar_register.c rar: Fix off by one error 2010-08-24 10:42:08 -07:00
intel_scu_ipc.c intel_scu_ipc: remove duplicated #include 2011-01-31 12:59:34 +10:00
intel_scu_ipcutil.c intel_scu_ipcutils: Fix the license tag 2011-01-26 08:57:18 +10:00
Kconfig platform/x86: ideapad-laptop depends on INPUT 2011-02-21 17:06:17 -05:00
Makefile intel_scu_ipc: Utility driver for intel scu ipc 2011-01-07 17:03:40 -05:00
msi-laptop.c msi-laptop: make struct rfkill_ops const 2010-08-03 09:49:00 -04:00
msi-wmi.c msi-wmi: fix semantically incorrect use of keycode instead of scancode 2010-11-24 12:00:28 -05:00
panasonic-laptop.c panasonic-laptop: Simplify calls to acpi_pcc_retrieve_biosdata 2010-10-21 10:10:50 -04:00
sony-laptop.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
tc1100-wmi.c platform: x86: tc1100-wmi: world-writable sysfs wireless and jogdial files 2011-02-21 17:06:13 -05:00
thinkpad_acpi.c thinkpad_acpi: Always report scancodes for hotkeys 2011-02-21 17:06:20 -05:00
topstar-laptop.c topstar-laptop - switch to using sparse keymap library 2010-10-21 09:36:42 -04:00
toshiba_acpi.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
toshiba_bluetooth.c ACPI: replace acpi_integer by u64 2010-01-28 01:47:33 -05:00
wmi.c WMI: return error if wmi_create_device() fails 2011-01-07 17:03:45 -05:00
xo1-rfkill.c Add OLPC XO-1 rfkill driver 2010-10-21 10:10:44 -04:00