| #
7bee9463 |
| 31-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
|
| #
930861c4 |
| 30-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 |
| 29-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
|
| #
90f959bc |
| 28-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 |
| 27-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
|
| #
a8339857 |
| 27-Mar-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
b92efa9a |
| 27-Mar-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
|
| #
13220a94 |
| 26-Mar-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1750 commits)
ixgbe: Allow Priority Flow Control setting
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1750 commits)
ixgbe: Allow Priority Flow Control settings to survive a device reset
net: core: remove unneeded include in net/core/utils.c.
e1000e: update version number
e1000e: fix close interrupt race
e1000e: fix loss of multicast packets
e1000e: commonize tx cleanup routine to match e1000 & igb
netfilter: fix nf_logger name in ebt_ulog.
netfilter: fix warning in ebt_ulog init function.
netfilter: fix warning about invalid const usage
e1000: fix close race with interrupt
e1000: cleanup clean_tx_irq routine so that it completely cleans ring
e1000: fix tx hang detect logic and address dma mapping issues
bridge: bad error handling when adding invalid ether address
bonding: select current active slave when enslaving device for mode tlb and alb
gianfar: reallocate skb when headroom is not enough for fcb
Bump release date to 25Mar2009 and version to 0.22
r6040: Fix second PHY address
qeth: fix wait_event_timeout handling
qeth: check for completion of a running recovery
qeth: unregister MAC addresses during recovery.
...
Manually fixed up conflicts in:
drivers/infiniband/hw/cxgb3/cxio_hal.h
drivers/infiniband/hw/nes/nes_nic.c
show more ...
|
| #
18ffa418 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into x86/setup-lzma
|
| #
5a54bd13 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into core/header-fixes
|
| #
a5ebc0b1 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into timers/core
|
| #
703a3cd7 |
| 23-Mar-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
|
Revision tags: v2.6.29 |
|
| #
0702b30d |
| 19-Mar-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
47239561 |
| 17-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/printk
|
| #
37ba1b62 |
| 17-Mar-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/opl3sa2-suspend' into topic/isa-misc
|
| #
edb35028 |
| 16-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'irq/genirq' and 'linus' into irq/core
|
| #
d6f818f7 |
| 15-Mar-2009 |
Nicolas Pitre <nico@cam.org> |
Merge commit '305b07680f' into orion/master
|
| #
97fb44eb |
| 13-Mar-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
|
|
Revision tags: v2.6.29-rc8 |
|
| #
25d50006 |
| 12-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/ipi
|