| #
8d7ccaa5 |
| 14-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
d4439087 |
| 14-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
73909f7a |
| 13-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into core/urgent
|
| #
a12e61df |
| 13-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc3' into x86/urgent
|
| #
742c5253 |
| 12-Aug-2008 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
|
| #
f2556896 |
| 11-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/defconfig
|
| #
e2205a15 |
| 11-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: Remove include/linux/harrie
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: Remove include/linux/harrier_defs.h
powerpc: Do not ignore arch/powerpc/include
powerpc: Delete completed "ppc removal" task from feature removal file
powerpc/mm: Fix attribute confusion with htab_bolt_mapping()
powerpc/pci: Don't keep ISA memory hole resources in the tree
powerpc: Zero fill the return values of rtas argument buffer
powerpc/4xx: Update defconfig files for 2.6.27-rc1
powerpc/44x: Incorrect NOR offset in Warp DTS
powerpc/44x: Warp DTS changes for board updates
powerpc/4xx: Cleanup Warp for i2c driver changes.
powerpc/44x: Adjust warp-nand resource end address
show more ...
|
| #
af7a5356 |
| 08-Aug-2008 |
Ben Dooks <ben-linux@fluff.org> |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
|
| #
9ea7d5ad |
| 06-Aug-2008 |
Josh Boyer <jwboyer@linux.vnet.ibm.com> |
powerpc/4xx: Update defconfig files for 2.6.27-rc1
Update the defconfig files for 4xx boards. This also makes the mutli-board
defconfigs a bit more useful by enabling some of the more common module
powerpc/4xx: Update defconfig files for 2.6.27-rc1
Update the defconfig files for 4xx boards. This also makes the mutli-board
defconfigs a bit more useful by enabling some of the more common modules.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
show more ...
|
| #
85e9ca33 |
| 31-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
| #
bc588df7 |
| 30-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into x86/xsave
|
| #
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
|
| #
ff877ea8 |
| 25-Jul-2008 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
|
| #
0e2f65ee |
| 25-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/pebs
Conflicts:
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
9063974c |
| 23-Jul-2008 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
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
|
| #
a208f37a |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/x2apic
|
| #
0679c2f4 |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into pci-for-jesse
|
| #
bb2c018b |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into cpus4096
Conflicts:
drivers/acpi/processor_throttling.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
f6dc8cca |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
9b610fda |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/nohz
|
| #
f1b0c8d3 |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/amd-iommu
|
| #
cdbfc557 |
| 18-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
|
| #
49997d75 |
| 18-Jul-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-m
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
show more ...
|
| #
77e44246 |
| 16-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/kprobes
|