David S. Miller abaa72d7fd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c		2012-07-19 11:17:30 -07:00
..
drivers	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-19 11:17:30 -07:00
include	most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set	2012-06-01 12:58:51 -04:00
kernel	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
os-Linux	um: Remove unused variables	2012-05-21 21:09:32 +02:00
scripts	um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS	2012-03-25 00:29:56 +01:00
sys-ia64
sys-ppc	um: change to new flag variables	2011-03-17 14:02:57 +01:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
defconfig	um: Remove CONFIG_IRQ_RELEASE_METHOD	2012-05-21 21:09:37 +02:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-24 13:29:46 -07:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Kconfig.net	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig.rest	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Kconfig.um	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Makefile	kbuild: link of vmlinux moved to a script	2012-05-05 21:19:33 +02:00
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas