#
5e51900b |
| 19-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into x86/cleanups
|
#
2e57572a |
| 16-Sep-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
|
#
83bd6998 |
| 14-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into timers/hpet
|
#
f81b691a |
| 14-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into x86/pat
|
#
3ce9bcb5 |
| 10-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'core/xen' into x86/xen
|
#
e92b4fda |
| 10-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into x86/iommu
|
#
429b022a |
| 10-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc6' into core/rcu
|
#
7e392f8c |
| 10-Sep-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6'
|
#
c051a0a2 |
| 10-Sep-2008 |
Simon Horman <horms@verge.net.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
|
#
17dce5df |
| 09-Sep-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
|
#
7f79d852 |
| 06-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/devel
|
#
77dd3b3b |
| 06-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/ntp
|
#
616ad8c4 |
| 05-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/defconfig
|
#
28c3cfd5 |
| 05-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/tracehook
|
#
0ccd8c39 |
| 04-Sep-2008 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'linus' into x86/core
|
#
42390cde |
| 04-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/x2apic
Conflicts: arch/x86/kernel/cpu/cyrix.c include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
9d7548d4 |
| 01-Sep-2008 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
6405c9cd |
| 28-Aug-2008 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
86d68898 |
| 28-Aug-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
#
811da237 |
| 26-Aug-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Update defconfigs for most
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Update defconfigs for most non-embedded platforms powerpc: Export CMO_PageSize powerpc/ps3: Fix ioremap of spu shadow regs powerpc/ps3: Rework htab code to remove ioremap powerpc/ps3: Update ps3_defconfig powerpc/cell/oprofile: Avoid double vfree of profile buffer powerpc: Update defconfigs for FSL PPC boards powerpc: Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target cpm2: Fix race condition in CPM2 GPIO library. powerpc: fix memory leaks in QE library powerpc/85xx: TQM8548: DTS file fixes and cleanup powerpc: Fix whitespace merge in mpc8641 hpcn device tree
show more ...
|
#
2bb2e1db |
| 21-Aug-2008 |
Kumar Gala <galak@kernel.crashing.org> |
powerpc: Update defconfigs for FSL PPC boards
Since we are updated defconfigs I went ahead and moved the asp8347_defconfig under 83xx/ and the mpc8536_ds_defconfig under 85xx/ as that is where they
powerpc: Update defconfigs for FSL PPC boards
Since we are updated defconfigs I went ahead and moved the asp8347_defconfig under 83xx/ and the mpc8536_ds_defconfig under 85xx/ as that is where they should have been to start with.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
show more ...
|
#
85e9ca33 |
| 31-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
#
9fec6060 |
| 30-Jul-2008 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig drivers/power/Makefile
|
#
908cf4b9 |
| 21-Jul-2008 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
|
#
0679c2f4 |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into pci-for-jesse
|