www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/memstick/host/jmb38x_ms.c

]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/memstick/host/jmb38x_ms.c

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 69e13ad fd04808)

author	Ingo Molnar <mingo@elte.hu>
	Sun, 12 Oct 2008 10:49:27 +0000 (12:49 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 12 Oct 2008 10:49:27 +0000 (12:49 +0200)
commit	1389ac4b976abdc0555280dfc1aa2c3abcc19641
tree	1ec51aa0b1e33201f6f4f3bebc657f9ec65f8539	tree \| snapshot
parent	69e13ad56f9e2cd81c4f8bfd6267211c10c14c08	commit \| diff
parent	fd048088306656824958e7783ffcee27e241b361	commit \| diff

Merge branch 'linus' into x86/signal

Conflicts:
arch/x86/kernel/signal_64.c

include/asm-x86/ptrace.h

Unnamed repository; edit this file 'description' to name the repository.