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
..
accessibility	…
acpi	…
amba	…
ata	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-03-18 06:31:43 -07:00
atm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
auxdisplay	…
base	…
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
bluetooth	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
cdrom	…
char	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
clk	…
clocksource	…
connector	…
cpufreq	…
cpuidle	…
crypto	…
dca	…
dio	…
dma	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
edac	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
eisa	…
firewire	…
firmware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
gpio	Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-18 10:56:02 -07:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-03-19 22:27:06 -07:00
hwmon	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
hwspinlock	…
i2c	i2c-i801: SMBus patch for Intel DH89xxCC DeviceIDs	2011-03-20 14:50:53 +01:00
ide	…
idle	…
ieee802154	…
infiniband	Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-03-17 18:40:35 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-03-19 22:27:06 -07:00
isdn	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
leds	…
lguest	…
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-03-18 06:31:43 -07:00
mca	…
md	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-03-19 22:27:06 -07:00
memstick	…
message	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
mfd	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
misc	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
mmc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc	2011-03-18 22:32:40 -07:00
mtd	Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6	2011-03-18 10:50:27 -07:00
net	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
nfc	…
nubus	…
of	…
oprofile	…
parisc	…
parport	…
pci	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-03-18 10:56:44 -07:00
pcmcia	…
platform	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
pnp	…
power	…
pps	…
ps3	…
rapidio	…
regulator	…
rtc	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
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
sbus	…
scsi	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
sfi	…
sh	…
sn	…
spi	Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-18 10:56:02 -07:00
ssb	…
staging	…
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
tc	…
telephony	…
thermal	…
tty	Merge branch 'next' into for-linus	2011-03-18 23:38:50 -07:00
uio	…
usb	USB: Move runtime PM callbacks to usb_device_pm_ops	2011-03-18 19:55:36 +01:00
uwb	…
vhost	…
video	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
virtio	…
vlynq	…
w1	…
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
xen	Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-03-17 18:37:42 -07:00
zorro	…
Kconfig	…
Makefile	…