| #
56dbed12 |
| 12-Jan-2011 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into idle-test
|
| #
acc6f112 |
| 09-Jan-2011 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/dir.c
|
| #
d2e7ad19 |
| 09-Jan-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off
Merge branch 'master' into next
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
show more ...
|
| #
1c2a48cf |
| 07-Jan-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/apic-cleanups
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <mingo@elte.h
Merge branch 'linus' into x86/apic-cleanups
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
5e93c6b4 |
| 07-Jan-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
| #
28d9bfc3 |
| 06-Jan-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (146
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (146 commits)
tools, perf: Documentation for the power events API
perf: Add calls to suspend trace point
perf script: Make some lists static
perf script: Use the default lost event handler
perf session: Warn about errors when processing pipe events too
perf tools: Fix perf_event.h header usage
perf test: Clarify some error reports in the open syscall test
x86, NMI: Add touch_nmi_watchdog to io_check_error delay
x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time
x86: Only call smp_processor_id in non-preempt cases
perf timechart: Adjust perf timechart to the new power events
perf: Clean up power events by introducing new, more generic ones
perf: Do not export power_frequency, but power_start event
perf test: Add test for counting open syscalls
perf evsel: Auto allocate resources needed for some methods
perf evsel: Use {cpu,thread}_map to shorten list of parameters
perf tools: Refactor all_tids to hold nr and the map
perf tools: Refactor cpumap to hold nr and the map
perf evsel: Introduce per cpu and per thread open helpers
perf evsel: Steal the counter reading routines from stat
...
show more ...
|
| #
bc030d6c |
| 04-Jan-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc8' into x86/apic
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: move to a fresh -rc, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
d392da52 |
| 30-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge v2.6.37-rc8 into powerpc/next
|
| #
8c1df400 |
| 22-Dec-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
|
| #
9d95b580 |
| 20-Dec-2010 |
Franck Bui-Huu <fbuihuu@gmail.com> |
perf probe: Fix line range description since a single file is allowed
$ perf-probe -L sched.c
is currently allowed but not documented.
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LKML-
perf probe: Fix line range description since a single file is allowed
$ perf-probe -L sched.c
is currently allowed but not documented.
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LKML-Reference: <1292854685-8230-5-git-send-email-fbuihuu@gmail.com>
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
show more ...
|
| #
8990c1bc |
| 14-Dec-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
|
| #
2ade0c1d |
| 10-Dec-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
|
| #
d834a9dc |
| 09-Dec-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'x86/amd-nb' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform
Conflicts:
arch/x86/include/asm/io_apic.h
Signed-off-by: Thomas Gleixner
Merge branch 'x86/amd-nb' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform
Conflicts:
arch/x86/include/asm/io_apic.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
| #
e4b546a3 |
| 02-Dec-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
|
| #
9d5b7f5b |
| 01-Dec-2010 |
Shawn Bohrer <shawn.bohrer@gmail.com> |
perf probe: Fix spelling mistake in documentation
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstr
perf probe: Fix spelling mistake in documentation
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1291168642-11402-8-git-send-email-shawn.bohrer@gmail.com>
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
show more ...
|
| #
92fd4d4d |
| 18-Nov-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc2' into sched/core
Merge reason: Move to a .37-rc base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
20b4755e |
| 16-Nov-2010 |
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> |
Merge commit 'v2.6.37-rc2' into upstream/xenfs
* commit 'v2.6.37-rc2': (10093 commits)
Linux 2.6.37-rc2
capabilities/syslog: open code cap_syslog logic to fix build failure
i2c: Sanity checks
Merge commit 'v2.6.37-rc2' into upstream/xenfs
* commit 'v2.6.37-rc2': (10093 commits)
Linux 2.6.37-rc2
capabilities/syslog: open code cap_syslog logic to fix build failure
i2c: Sanity checks on adapter registration
i2c: Mark i2c_adapter.id as deprecated
i2c: Drivers shouldn't include <linux/i2c-id.h>
i2c: Delete unused adapter IDs
i2c: Remove obsolete cleanup for clientdata
include/linux/kernel.h: Move logging bits to include/linux/printk.h
Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again)
hwmon: (w83795) Check for BEEP pin availability
hwmon: (w83795) Clear intrusion alarm immediately
hwmon: (w83795) Read the intrusion state properly
hwmon: (w83795) Print the actual temperature channels as sources
hwmon: (w83795) List all usable temperature sources
hwmon: (w83795) Expose fan control method
hwmon: (w83795) Fix fan control mode attributes
hwmon: (lm95241) Check validity of input values
hwmon: Change mail address of Hans J. Koch
PCI: sysfs: fix printk warnings
GFS2: Fix inode deallocation race
...
show more ...
|
| #
a0205634 |
| 16-Nov-2010 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'v2.6.37-rc2' into for-2.6.38/core
|
| #
c94f28c3 |
| 15-Nov-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
|
| #
1bb95834 |
| 15-Nov-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
|
| #
69dbdd81 |
| 03-Nov-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/asoc' into for-linus
|
| #
0a27f050 |
| 03-Nov-2010 |
Liam Girdwood <lrg@slimlogic.co.uk> |
Merge commit 'v2.6.37-rc1' into for-2.6.38
|
| #
8f987768 |
| 03-Nov-2010 |
Liam Girdwood <lrg@slimlogic.co.uk> |
Merge commit 'v2.6.37-rc1' into for-2.6.37
|
| #
9e3be1ed |
| 02-Nov-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.37' into HEAD
WARN() fix from Joe moved.
Conflicts:
sound/soc/codecs/wm_hubs.c
|
| #
29c798fe |
| 02-Nov-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.37-rc1' into for-2.6.37
|