| #
93776a8e |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/core
Merge reason: update to upstream tracing facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
2e8844e1 |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/hw-branch-tracing
Merge reason: update to latest tracing and ptrace APIs
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
5e344378 |
| 07-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
|
| #
f541ae32 |
| 06-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perfcounters/core-v2
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch
Merge branch 'linus' into perfcounters/core-v2
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/irq.c
arch/x86/kernel/syscall_table_32.S
arch/x86/mm/iomap_32.c
include/linux/sched.h
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
9efe21cb |
| 06-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
|
| #
478c6a43 |
| 05-Apr-2009 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
|
| #
83f2f0ed |
| 02-Apr-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
7bee9463 |
| 31-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
|
| #
930861c4 |
| 31-Mar-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
65fb0d23 |
| 30-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
|
| #
9ff9a26b |
| 30-Mar-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
|
| #
13223cb0 |
| 29-Mar-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
90f959bc |
| 29-Mar-2009 |
Dave Airlie <airlied@redhat.com> |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
|
| #
38a6ed3e |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/printk
|
| #
d00ab2fd |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/futexes
|
| #
b0d44c0d |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
|
| #
3fab1910 |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/core
|
| #
ed40d0c4 |
| 28-Mar-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
|
| #
bb798169 |
| 28-Mar-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
|
| #
82268da1 |
| 28-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.c
Manual merge to resolve build warning due to phys_addr_t type change
on
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.c
Manual merge to resolve build warning due to phys_addr_t type change
on x86:
drivers/gpu/drm/drm_info.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
a8339857 |
| 28-Mar-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
2c9e15a0 |
| 27-Mar-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6: (27 commits)
ext
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6: (27 commits)
ext2: Zero our b_size in ext2_quota_read()
trivial: fix typos/grammar errors in fs/Kconfig
quota: Coding style fixes
quota: Remove superfluous inlines
quota: Remove uppercase aliases for quota functions.
nfsd: Use lowercase names of quota functions
jfs: Use lowercase names of quota functions
udf: Use lowercase names of quota functions
ufs: Use lowercase names of quota functions
reiserfs: Use lowercase names of quota functions
ext4: Use lowercase names of quota functions
ext3: Use lowercase names of quota functions
ext2: Use lowercase names of quota functions
ramfs: Remove quota call
vfs: Use lowercase names of quota functions
quota: Remove dqbuf_t and other cleanups
quota: Remove NODQUOT macro
quota: Make global quota locks cacheline aligned
quota: Move quota files into separate directory
ext4: quota reservation for delayed allocation
...
show more ...
|
|
Revision tags: v2.6.29, v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3 |
|
| #
884d179d |
| 26-Jan-2009 |
Jan Kara <jack@suse.cz> |
quota: Move quota files into separate directory
Quota subsystem has more and more files. It's time to create a dir for it.
Signed-off-by: Jan Kara <jack@suse.cz>
|