History log of /linux/drivers/rapidio/rio-driver.c (Results 251 – 275 of 303)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.27, v2.6.27-rc9, v2.6.27-rc8, v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3, v2.6.27-rc2, v2.6.27-rc1, v2.6.26
# dbbcfb22 13-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

arch/x86/mm/ioremap.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 85e9ca33 31-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/hpet


# 9fec6060 30-Jul-2008 Anton Vorontsov <cbouatmailru@gmail.com>

Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

drivers/power/Kconfig
drivers/power/Makefile


# ff877ea8 25-Jul-2008 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6


# 0e2f65ee 25-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/pebs

Conflicts:

arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 9063974c 23-Jul-2008 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 908cf4b9 21-Jul-2008 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next


# 0679c2f4 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into pci-for-jesse


# f6dc8cca 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 9b610fda 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/nohz


# f1b0c8d3 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/amd-iommu


# cdbfc557 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/cleanups


# 49997d75 18-Jul-2008 David S. Miller <davem@davemloft.net>

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-m

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c

show more ...


# 82638844 16-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into cpus4096

Conflicts:

arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 1e094813 15-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/softlockup

Conflicts:

kernel/softlockup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 0c17e4ce 15-Jul-2008 Ben Dooks <ben-linux@fluff.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk


# 91d0322b 15-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/urgent


# 2fceef39 14-Jul-2008 Jonathan Corbet <corbet@lwn.net>

Merge commit 'v2.6.26' into bkl-removal


# b4ba0ba2 14-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.26' into core/locking


# 11c2d817 14-Jul-2008 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/HEAD' into test-merge

Manual fixup of include/asm-powerpc/pgtable-ppc64.h


# 54ef76f3 13-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into sched/devel


# ae94b807 12-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/core

Conflicts:

arch/x86/mm/ioremap.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# a7de3902 11-Jul-2008 Eugene Surovegin <ebs@ebshome.net>

rapidio: fix device reference counting

Fix RapidIO device reference counting.

Signed-of-by: Eugene Surovegin <ebs@ebshome.net>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: <stable@kernel.org>

rapidio: fix device reference counting

Fix RapidIO device reference counting.

Signed-of-by: Eugene Surovegin <ebs@ebshome.net>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

show more ...


Revision tags: v2.6.26-rc9, v2.6.26-rc8, v2.6.26-rc7, v2.6.26-rc6, v2.6.26-rc5, v2.6.26-rc4, v2.6.26-rc3, v2.6.26-rc2, v2.6.26-rc1
# f838bad1 22-Apr-2008 David Woodhouse <dwmw2@infradead.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


Revision tags: v2.6.25, v2.6.25-rc9, v2.6.25-rc8, v2.6.25-rc7
# 577f99c1 18-Mar-2008 David S. Miller <davem@davemloft.net>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c


1...<<111213