| #
c15cb37c |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/uv
|
| #
78f902cc |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/doc
|
| #
dd7a5230 |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/cpufeature
|
| #
e18d7af8 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/mm
|
| #
aa9c9b8c |
| 08-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/quirks
|
| #
c0515566 |
| 04-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc7' into x86/cleanups
|
| #
cb9c34e6 |
| 04-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc7' into core/locking
|
| #
ec98ce48 |
| 04-Dec-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
|
| #
52749188 |
| 03-Dec-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge'
|
| #
f6d2e6f5 |
| 01-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/iommu
|
| #
3af4182c |
| 01-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'upstream' into topic/asoc
|
| #
3bdae4f4 |
| 28-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/debug' into x86/irq
We merge this branch because x86/debug touches code that we started
cleaning up in x86/irq. The two branches started out independent,
but as unexpected amount o
Merge branch 'x86/debug' into x86/irq
We merge this branch because x86/debug touches code that we started
cleaning up in x86/irq. The two branches started out independent,
but as unexpected amount of activity went into x86/irq, they became
dependent. Resolve that by this cross-merge.
show more ...
|
| #
b5a20aa2 |
| 28-Nov-2008 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
7fbb8759 |
| 26-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into core/debug
|
| #
65d76f36 |
| 25-Nov-2008 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
|
| #
3e1d7a62 |
| 24-Nov-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into core/futexes
|
| #
9f144164 |
| 23-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into irq/urgent
|
| #
a0a70c73 |
| 23-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'tracing/profiling', 'tracing/options' and 'tracing/urgent' into tracing/core
|
| #
ca9eed76 |
| 23-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into x86/debug
|
| #
57550b27 |
| 21-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into x86/urgent
|
| #
fc02e90c |
| 21-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into sched/core
|
| #
6ab33d51 |
| 21-Nov-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
include/net/mac80211.h
net/phonet/af_phonet.c
|
| #
c93fc287 |
| 20-Nov-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: csrc-r4k: Fix declaration depending on the wrong C
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol.
MIPS: csrc-r4k: Fix spelling mistake.
MIPS: RB532: Provide functions for gpio configuration
MIPS: IP22: Make indy_sc_ops variable static
MIPS: RB532: GPIO register offsets are relative to GPIOBASE
MIPS: Malta: Fix include paths in malta-amon.c
show more ...
|
|
Revision tags: v2.6.28-rc4, v2.6.28-rc3 |
|
| #
2e373952 |
| 01-Nov-2008 |
Phil Sutter <n0-1@freewrt.org> |
MIPS: RB532: Provide functions for gpio configuration
As gpiolib doesn't support pin multiplexing, it provides no way to
access the GPIOFUNC register. Also there is no support for setting
interrupt
MIPS: RB532: Provide functions for gpio configuration
As gpiolib doesn't support pin multiplexing, it provides no way to
access the GPIOFUNC register. Also there is no support for setting
interrupt status and level. These functions provide access to them and
are needed by the CompactFlash driver.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
show more ...
|
| #
90accd6f |
| 20-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/memory-corruption-check
|