David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	arch/microblaze/include/asm/socket.h

2009-08-12 17:44:53 -07:00

..

boot

m32r: build fix for __stringify macro

2009-05-02 21:43:26 +09:00

configs

eeprom: More consistent symbol names

2009-01-26 21:19:57 +01:00

include/asm

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-08-12 17:44:53 -07:00

kernel

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

lib

m32r: export __ndelay

2008-09-27 18:27:21 +09:00

mm

Move FAULT_FLAG_xyz into handle_mm_fault() callers

2009-06-21 13:08:22 -07:00

oprofile

oprofile: more whitespace fixes

2008-10-15 20:55:51 +02:00

platforms

m32r: remove obsolete hw_interrupt_type

2009-06-16 19:47:46 -07:00

Kconfig

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-12-30 08:02:35 +10:30

Kconfig.debug

…

Makefile

…