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
..
appldata	[S390] appldata: fix dev_get_stats 64 bit conversion	2010-08-13 10:06:55 +02:00
boot	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-03-20 18:14:55 -07:00
crypto	crypto: sha-s390 - Reset index after processing partial block	2011-02-07 20:26:06 +11:00
hypfs	[S390] hypfs: Move buffer allocation from open to read	2011-01-05 12:47:27 +01:00
include/asm	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2011-03-17 10:10:49 -07:00
kernel	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2011-03-17 10:10:49 -07:00
kvm	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
lib	futex: Sanitize futex ops argument types	2011-03-11 12:23:31 +01:00
math-emu	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
mm	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
oprofile	oprofile, s390: Cleanups	2011-03-16 14:30:40 +01:00
defconfig	[S390] Update default configuration	2011-01-12 09:55:24 +01:00
Kbuild	[S390] standardize Kbuild rules	2010-10-25 16:10:14 +02:00
Kconfig	oprofile, s390: Cleanups	2011-03-16 14:30:40 +01:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	[S390] remove redundant stack check option	2011-03-15 17:08:22 +01:00