| #
e14eee56 |
| 11-Mar-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin/master' into next
|
| #
e161183b |
| 10-Mar-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
efdcd41b |
| 09-Mar-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/vmaster-update' into topic/docbook-fix
|
| #
abcea2c3 |
| 09-Mar-2009 |
Eric Miao <eric.miao@marvell.com> |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
|
| #
d15c22e7 |
| 08-Mar-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.29-rc7' into next
|
| #
7df4edb0 |
| 05-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
|
| #
a140feab |
| 05-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc7' into core/locking
|
|
Revision tags: v2.6.29-rc7 |
|
| #
d4fc7cea |
| 03-Mar-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
c02368a9 |
| 02-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/genirq
|
| #
4434e515 |
| 26-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
|
| #
8e818179 |
| 26-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
e36b1e13 |
| 25-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'linus' into tracing/core
|
| #
2e31add2 |
| 25-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/pat
|
| #
87b20307 |
| 24-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into core/percpu
|
| #
a852cbfa |
| 24-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core
|
| #
a7f4463e |
| 24-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
|
| #
e70049b9 |
| 24-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
467388f2 |
| 24-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
dc731ca6 |
| 23-Feb-2009 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge branch 'x86/urgent' into x86/mce2
|
| #
66a101dd |
| 23-Feb-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
|
|
Revision tags: v2.6.29-rc6 |
|
| #
fc6fc7f1 |
| 22-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic conflict resolution:
arch/x86/kernel/setup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
3d92e8f3 |
| 22-Feb-2009 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k: atari - Rename "mfp" to "st_mfp"
http://kisskb.ellerman.id.au/kisskb/buildresult/72115/:
| net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile'
| net/mac80211/ieee80211_i.h:35
m68k: atari - Rename "mfp" to "st_mfp"
http://kisskb.ellerman.id.au/kisskb/buildresult/72115/:
| net/mac80211/ieee80211_i.h:327: error: syntax error before 'volatile'
| net/mac80211/ieee80211_i.h:350: error: syntax error before '}' token
| net/mac80211/ieee80211_i.h:455: error: field 'sta' has incomplete type
| distcc[19430] ERROR: compile net/mac80211/main.c on sprygo/32 failed
This is caused by
| # define mfp ((*(volatile struct MFP*)MFP_BAS))
in arch/m68k/include/asm/atarihw.h, which conflicts with the new "mfp" enum in
net/mac80211/ieee80211_i.h.
Rename "mfp" to "st_mfp", as it's a way too generic name for a global #define.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
2702e0a4 |
| 22-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
|
Revision tags: v2.6.29-rc5 |
|
| #
871cafcc |
| 12-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/softlockup
|
| #
89139374 |
| 11-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc4' into x86/cleanups
|