You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds fc6bdb59a5 Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc ... Pull OLPC platform updates from Andres Salomon: "These move the OLPC Embedded Controller driver out of arch/x86/platform and into drivers/platform/olpc. OLPC machines are now ARM-based (which means lots of x86 and ARM changes), but are typically pretty self-contained.. so it makes more sense to go through a separate OLPC tree after getting the appropriate review/ACKs." * 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc: x86: OLPC: move s/r-related EC cmds to EC driver Platform: OLPC: move global variables into priv struct Platform: OLPC: move debugfs support from x86 EC driver x86: OLPC: switch over to using new EC driver on x86 Platform: OLPC: add a suspended flag to the EC driver Platform: OLPC: turn EC driver into a platform_driver Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call it drivers: OLPC: update various drivers to include olpc-ec.h Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driver		13 years ago
..
alpha	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
arm	ARM: arm-soc Marvell Orion device-tree updates	13 years ago
avr32	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
blackfin	Merge branch 'akpm' (Andrew's patch-bomb)	13 years ago
c6x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	13 years ago
cris	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
frv	Merge branch 'akpm' (Andrew's patch-bomb)	13 years ago
h8300	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
hexagon	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	13 years ago
ia64	Merge branch 'akpm' (Andrew's patch-bomb)	13 years ago
m32r	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
m68k	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
microblaze	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
mips	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	13 years ago
mn10300	Merge branch 'akpm' (Andrew's patch-bomb)	13 years ago
openrisc	Remove useless wrappers of asm-generic/rmap.h	13 years ago
parisc	PCI changes for the 3.6 merge window:	13 years ago
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
s390	Merge branch 'akpm' (Andrew's patch-bomb)	13 years ago
score	…
sh	sh: explicitly include sh_dma.h in setup-sh7722.c	13 years ago
sparc	This patch series contains a major revamp of how we collect entropy	13 years ago
tile	memcg: rename config variables	13 years ago
um	Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	13 years ago
unicore32	PCI changes for the 3.6 merge window:	13 years ago
x86	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	13 years ago
xtensa	xtensa: select generic atomic64_t support	13 years ago
.gitignore	…
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago