Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile		2011-03-20 18:14:55 -07:00
..
boot	xtensa: change to new flag variable	2011-03-17 14:02:57 +01:00
configs	Merge branch 'master' into for-next	2011-02-15 10:24:31 +01:00
include/asm	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-03-16 15:11:04 -07:00
kernel	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-03-16 08:22:41 -07:00
lib	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
mm	xtensa: invoke oom-killer from page fault	2010-06-04 15:21:44 -07:00
platforms	xtensa: Fix the network driver for the simulator target	2010-05-02 08:37:20 -07:00
variants	xtensa: support s6000 gpio irqs and alternate function selection	2009-06-22 02:37:26 -07:00
Kconfig	Merge branch 'kbuild/rc-fixes' into kbuild/kconfig	2010-10-12 15:09:06 +02:00
Kconfig.debug	[PATCH] xtensa: Architecture support for Tensilica Xtensa Part 1	2005-06-24 00:05:21 -07:00
Makefile	xtensa: Add -mforce-no-pic option is supported	2010-05-02 01:00:22 -07:00