| #
53ba4f2f |
| 03-May-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.34-rc6' into core/locking
|
| #
df2071bd |
| 03-May-2010 |
Herbert Xu <herbert@gondor.apana.org.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
868c522b |
| 30-Apr-2010 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.34-rc6' into core/locking
Merge reason: Further lockdep patches depend on per cpu updates
made in -rc1.
|
| #
d9c5841e |
| 29-Apr-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
show more ...
|
| #
a36bf32e |
| 23-Apr-2010 |
Robert Richter <robert.richter@amd.com> |
Merge commit 'v2.6.34-rc5' into oprofile/core
|
| #
6c9468e9 |
| 23-Apr-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
| #
62910554 |
| 20-Apr-2010 |
Patrick McHardy <kaber@trash.net> |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <k
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
show more ...
|
| #
87d8a697 |
| 09-Apr-2010 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
c9494727 |
| 02-Apr-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: update to latest upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
d25d6fa1 |
| 30-Mar-2010 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
329f9052 |
| 26-Mar-2010 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/nand/sh_flctl.c
Maxim's patch to initialise sysfs attributes depends on the patch w
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/nand/sh_flctl.c
Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().
show more ...
|
| #
d2f1e15b |
| 22-Mar-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.34-rc2' into perf/core
Merge reason: Pick up latest perf fixes from upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
74511020 |
| 22-Mar-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.34' into for-2.6.35
|
| #
2fb20b61 |
| 22-Mar-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/misc' into topic/usb
|
| #
4a35ecf8 |
| 07-Apr-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
|
| #
87e8b821 |
| 03-Apr-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
3595be77 |
| 31-Mar-2010 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'v2.6.34-rc2' into drm-linus
|
| #
91c030b4 |
| 23-Mar-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
f9b44121 |
| 22-Mar-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.34-rc2' into for-2.6.34
|
| #
61d71807 |
| 18-Mar-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
backlight: panasonic-laptop - Fix incomplete registration fa
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
backlight: panasonic-laptop - Fix incomplete registration failure handling
backlight: msi-laptop, msi-wmi: fix incomplete registration failure handling
backlight: blackfin - Fix missing registration failure handling
backlight: classmate-laptop - Fix missing registration failure handling
backlight: mbp_nvidia_bl - add five more MacBook variants
backlight: Allow properties to be passed at registration
backlight: Add backlight_device parameter to check_fb
video: backlight/progear, fix pci device refcounting
backlight: l4f00242t03: Fix module licence absence.
backlight: Revert some const qualifiers
backlight: Add Epson L4F00242T03 LCD driver
show more ...
|
| #
a19a6ee6 |
| 17-Feb-2010 |
Matthew Garrett <mjg@redhat.com> |
backlight: Allow properties to be passed at registration
Values such as max_brightness should be set before backlights are
registered, but the current API doesn't allow that. Add a parameter to
back
backlight: Allow properties to be passed at registration
Values such as max_brightness should be set before backlights are
registered, but the current API doesn't allow that. Add a parameter to
backlight_device_register and update drivers to ensure that they
set this correctly.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
show more ...
|
| #
b7e56edb |
| 17-Feb-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
| #
84abd88a |
| 11-Feb-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge remote branch 'linus/master' into x86/bootmem
|
| #
e1a0bdd8 |
| 02-Feb-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
|
| #
0ada0a73 |
| 28-Jan-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
|