Changes in sysfs-class-lcd

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

f43dc23d5ea91fca257be02138a255f02d98e806 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Thu, 13 Jan 2011 07:06:28 +0100

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-reworkConflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

6548698f929814375fa5d62ae1db96959b0418c1 - Merge commit 'v2.6.32' into reiserfs/kill-bkl

Mon, 07 Dec 2009 07:28:35 +0100

Merge commit 'v2.6.32' into reiserfs/kill-bklMerge-reason: The tree was based 2.6.31. It's better to be up to datewith 2.6.32. Although no conflicting changes were made in between,it gives benchmarking results closer to the lastest kernel behaviour. List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

838632438145ac6863377eb12d8b8eef9c55d288 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Tue, 01 Dec 2009 08:16:22 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

46557bef3f3834ac33031c7be27d39d90d507442 - Merge branch 'drm-core-next' of ../linux-2.6 into drm-next

Wed, 18 Nov 2009 01:09:55 +0100

Merge branch 'drm-core-next' of ../linux-2.6 into drm-next List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1 - Merge commit 'v2.6.32-rc5' into for-linus

Tue, 03 Nov 2009 07:10:07 +0100

Merge commit 'v2.6.32-rc5' into for-linus List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

e87a3dd33eab30b4db539500064a9584867e4f2c - Merge branch 'fix/misc' into topic/misc

Sun, 01 Nov 2009 11:11:07 +0100

Merge branch 'fix/misc' into topic/misc List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

0b9e31e9264f1bad89856afb96da1688292f13b4 - Merge branch 'linus' into sched/core

Sun, 25 Oct 2009 17:30:53 +0100

Merge branch 'linus' into sched/coreConflicts: fs/proc/array.cMerge reason: resolve conflict and queue up dependent patch.Signed-off-by: Ingo Molnar List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

0f8f86c7bdd1c954fbe153af437a0d91a6c5721a - Merge commit 'perf/core' into perf/hw-breakpoint

Sun, 18 Oct 2009 01:09:09 +0200

Merge commit 'perf/core' into perf/hw-breakpointConflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/MakefileMerge reason: We need to be uptodate with the perf events developmentbranch because we plan to rewrite the breakpoints API on top ofperf events. List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b - Merge commit 'v2.6.32-rc3'

Tue, 06 Oct 2009 17:36:55 +0200

Merge commit 'v2.6.32-rc3' List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

907bc6c7fc7071b00083fc11e510e47dd93df45d - Merge branch 'for-2.6.32' into for-2.6.33

Tue, 06 Oct 2009 17:01:27 +0200

Merge branch 'for-2.6.32' into for-2.6.33 List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

d9b2002c406011164f245de7a81304625989f1c9 - Merge branch 'perf/urgent' into perf/core

Tue, 06 Oct 2009 15:02:30 +0200

Merge branch 'perf/urgent' into perf/coreMerge reason: Upcoming patch is dependent on a fix in perf/urgent.Signed-off-by: Ingo Molnar List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

0aa73ba1c4e1ad1d51a29e0df95ccd9f746918b6 - Merge branch 'tracing/urgent' into tracing/core

Thu, 01 Oct 2009 11:20:33 +0200

Merge branch 'tracing/urgent' into tracing/coreMerge reason: Pick up latest fixes and update to latest upstream.Signed-off-by: Ingo Molnar List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

1669b049db50fc7f1d4e694fb115a0f408c63fce - Merge branch 'master' into next

Tue, 29 Sep 2009 23:47:33 +0200

Merge branch 'master' into next List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

8b3f6af86378d0a10ca2f1ded1da124aef13b62c - Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Fri, 25 Sep 2009 00:13:11 +0200

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

baea7b946f00a291b166ccae7fcfed6c01530cc6 - Merge branch 'origin' into for-linus

Thu, 24 Sep 2009 22:22:33 +0200

Merge branch 'origin' into for-linusConflicts: MAINTAINERS List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

d2ff6de537c61a0f05731c6679f3e1abc2d95e68 - Merge branch 'linus' into x86/urgent

Thu, 24 Sep 2009 12:59:11 +0200

Merge branch 'linus' into x86/urgentMerge reason: Queueing up dependent early-printk fix.Signed-off-by: Ingo Molnar List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

d7a4b414eed51f1653bb05ebe84122bf9a7ae18b - Merge commit 'linus/master' into tracing/kprobes

Wed, 23 Sep 2009 23:08:43 +0200

Merge commit 'linus/master' into tracing/kprobesConflicts: kernel/trace/Makefile kernel/trace/trace.h kernel/trace/trace_event_types.h kernel/trace/trace_export.cMerge reason: Sync with latest significant tracing core changes. List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

c11f6c82581e8be4e1829c677db54e7f55cebece - Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

Wed, 23 Sep 2009 18:32:11 +0200

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: (119 commits) ACPI: don't pass handle for fixed hardware notifications ACPI: remove null pointer checks in deferred execution path ACPI: simplify deferred execution path acerhdf: additional BIOS versions acerhdf: convert to dev_pm_ops acerhdf: fix fan control for AOA150 model thermal: add missing Kconfig dependency acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file hp-wmi: fix rfkill memory leak on unload ACPI: remove unnecessary #ifdef CONFIG_DMI ACPI: linux/acpi.h should not include linux/dmi.h hwmon driver for ACPI 4.0 power meters topstar-laptop: add new driver for hotkeys support on Topstar N01 thinkpad_acpi: fix rfkill memory leak on unload thinkpad-acpi: report brightness events when required thinkpad-acpi: don't poll by default any of the reserved hotkeys thinkpad-acpi: Fix procfs hotkey reset command thinkpad-acpi: deprecate hotkey_bios_mask thinkpad-acpi: hotkey poll fixes thinkpad-acpi: be more strict when detecting a ThinkPad ... List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd

b4549a24b6194201077d0295207ec204f785fab1 - Merge branch 'asus' into release

Sat, 19 Sep 2009 07:55:27 +0200

Merge branch 'asus' into release List of files: /linux/Documentation/ABI/testing/sysfs-class-lcd