History log of /linux/drivers/atm/Makefile (Results 76 – 100 of 171)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 418f19ea 31-Dec-2008 Pierre Ossman <drzeus@drzeus.cx>

Merge branch 'master' of ../mmc


# a9de18eb 31-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/include/asm/pda.h
kernel/fork.c


# 33edcf13 29-Dec-2008 Rusty Russell <rusty@rustcorp.com.au>

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


# 75329f1f 29-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/cleanups


# 0f01f07f 29-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' into tracing/core


# 0ce74d92 29-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/hrtimers

Conflicts:
sound/drivers/pcsp/pcsp.c

Semantic conflict:

sound/core/hrtimer.c


# e1df9576 29-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into perfcounters/core

Conflicts:
fs/exec.c
include/linux/init_task.h

Simple context conflicts.


# 0a8c5395 29-Dec-2008 Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>

[XFS] Fix merge failures

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

Conflicts:

fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.

[XFS] Fix merge failures

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

Conflicts:

fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

show more ...


# e3c6d4ee 29-Dec-2008 David S. Miller <davem@davemloft.net>

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

Conflicts:
arch/sparc64/kernel/idprom.c


# 0191b625 28-Dec-2008 Linus Torvalds <torvalds@linux-foundation.org>

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenrin

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

show more ...


Revision tags: v2.6.28
# 9c54004e 23-Dec-2008 David Woodhouse <dwmw2@infradead.org>

atm: Driver for Solos PCI ADSL2+ card.

This adds basic support for the 'Solos' PCI ADSL2+ cards being developed
by Traverse Technologies and Xrio Ltd:
http://www.traverse.com.au/productview.php?prod

atm: Driver for Solos PCI ADSL2+ card.

This adds basic support for the 'Solos' PCI ADSL2+ cards being developed
by Traverse Technologies and Xrio Ltd:
http://www.traverse.com.au/productview.php?product_id=116

Signed-off-by: Nathan Williams <nathan@traverse.com.au>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

show more ...


Revision tags: v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3
# 7a9787e1 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks


Revision tags: v2.6.28-rc2, v2.6.28-rc1
# b2aaf8f7 15-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h


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
# 3e370b29 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

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

Conflicts:

drivers/pci/quirks.c

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


# f68ec0c2 03-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc8' into x86/setup


# d6d5aeb6 02-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc8' into genirq


# c4c0c56a 11-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/rcu


# af7a5356 08-Aug-2008 Ben Dooks <ben-linux@fluff.org>

Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk


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

Merge branch 'linus' into timers/hpet


# bc588df7 30-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/core' into x86/xsave


# 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


# cb28a1bb 29-Jul-2008 Ingo Molnar <mingo@elte.hu>

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

Conflicts:

arch/x86/Kconfig

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


# eda3d8f5 27-Jul-2008 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Merge commit 'upstream/master'


# 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>


1234567