Linus Torvalds b7d41a9fbb Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 ...

* 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: remove the old IEEE 1394 driver stack
  ieee1394: move init_ohci1394_dma to drivers/firewire/

Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is
getting removed, but was modified by the networking merge.

2010-10-25 08:05:29 -07:00

..

accessibility

…

acpi

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

amba

…

ata

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

atm

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

auxdisplay

…

base

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

block

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

2010-10-22 20:30:48 -07:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-10-23 11:47:02 -07:00

cdrom

…

char

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-10-25 07:59:01 -07:00

clocksource

…

connector

…

cpufreq

…

cpuidle

…

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2010-10-24 12:44:34 -07:00

dca

…

dio

…

dma

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

edac

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

eisa

…

firewire

Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2010-10-25 08:05:29 -07:00

firmware

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

gpio

…

gpu

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-10-25 07:59:01 -07:00

hwmon

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

i2c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2010-10-25 07:51:49 -07:00

ide

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

idle

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

ieee802154

…

infiniband

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-10-25 07:59:01 -07:00

isdn

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

leds

…

lguest

…

macintosh

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

mca

…

md

Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block

2010-10-22 17:07:18 -07:00

media

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-10-25 07:59:01 -07:00

memstick

…

message

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2010-10-22 17:34:15 -07:00

mfd

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-10-25 07:59:01 -07:00

misc

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

mmc

Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block

2010-10-22 17:07:18 -07:00

mtd

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

net

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

nubus

…

of

…

oprofile

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

parisc

…

parport

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

pci

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

pcmcia

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

platform

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

pnp

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

power

…

pps

…

ps3

…

rapidio

…

regulator

…

rtc

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

s390

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

sbus

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

serial

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2010-10-25 07:51:49 -07:00

sfi

…

sh

…

sn

…

spi

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

ssb

…

staging

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-10-25 07:59:01 -07:00

tc

…

telephony

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

thermal

…

uio

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

usb

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2010-10-25 07:51:49 -07:00

uwb

…

vhost

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-10-23 11:47:02 -07:00

video

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2010-10-25 07:51:49 -07:00

virtio

…

vlynq

…

w1

…

watchdog

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

xen

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

zorro

…

Kconfig

…

Makefile

Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2010-10-25 08:05:29 -07:00