History log of /linux/drivers/atm/Makefile (Results 101 – 125 of 171)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 28afe961 24-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into tracing/urgent


# 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


# 8725f25a 22-Jul-2008 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/master'

Manually fixed up:

drivers/net/fs_enet/fs_enet-main.c


# 76c3bb15 22-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/x2apic


# 8294fafd 22-Jul-2008 Andi Kleen <ak@linux.intel.com>

Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into release-2.6.27


# eb6a12c2 21-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into cpus4096-for-linus

Conflicts:

net/sunrpc/svc.c

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


# e66d90fb 21-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into xen-64bit


# 1c29dd9a 21-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/paravirt-spinlocks


# e27772b4 21-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/urgent


# 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


# db6d8c7a 21-Jul-2008 Linus Torvalds <torvalds@linux-foundation.org>

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits)
iucv: Fix bad merging.
net_sched: Add size table f

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits)
iucv: Fix bad merging.
net_sched: Add size table for qdiscs
net_sched: Add accessor function for packet length for qdiscs
net_sched: Add qdisc_enqueue wrapper
highmem: Export totalhigh_pages.
ipv6 mcast: Omit redundant address family checks in ip6_mc_source().
net: Use standard structures for generic socket address structures.
ipv6 netns: Make several "global" sysctl variables namespace aware.
netns: Use net_eq() to compare net-namespaces for optimization.
ipv6: remove unused macros from net/ipv6.h
ipv6: remove unused parameter from ip6_ra_control
tcp: fix kernel panic with listening_get_next
tcp: Remove redundant checks when setting eff_sacks
tcp: options clean up
tcp: Fix MD5 signatures for non-linear skbs
sctp: Update sctp global memory limit allocations.
sctp: remove unnecessary byteshifting, calculate directly in big-endian
sctp: Allow only 1 listening socket with SO_REUSEADDR
sctp: Do not leak memory on multiple listen() calls
sctp: Support ipv6only AF_INET6 sockets.
...

show more ...


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

Merge branch 'linus' into x86/x2apic


# 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


# 84c3d4aa 16-Jul-2008 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/master'

Manual merge of:

arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c


# 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


# 5a861022 15-Jul-2008 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6

* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
firmware: convert sb16_csp driver to

Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6

* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
firmware: convert sb16_csp driver to use firmware loader exclusively
dsp56k: use request_firmware
edgeport-ti: use request_firmware()
edgeport: use request_firmware()
vicam: use request_firmware()
dabusb: use request_firmware()
cpia2: use request_firmware()
ip2: use request_firmware()
firmware: convert Ambassador ATM driver to request_firmware()
whiteheat: use request_firmware()
ti_usb_3410_5052: use request_firmware()
emi62: use request_firmware()
emi26: use request_firmware()
keyspan_pda: use request_firmware()
keyspan: use request_firmware()
ttusb-budget: use request_firmware()
kaweth: use request_firmware()
smctr: use request_firmware()
firmware: convert ymfpci driver to use firmware loader exclusively
firmware: convert maestro3 driver to use firmware loader exclusively
...

Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
drivers/char/ip2/ip2main.c manually.

show more ...


# 751851af 15-Jul-2008 David Woodhouse <David.Woodhouse@intel.com>

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

Conflicts:

sound/pci/Kconfig


Revision tags: v2.6.26, v2.6.26-rc9, v2.6.26-rc8, v2.6.26-rc7, v2.6.26-rc6
# 27d202ff 05-Jun-2008 David Woodhouse <dwmw2@infradead.org>

firmware: convert Ambassador ATM driver to request_firmware()

Since it had various regions to be loaded to separate addresses, and it
wanted to do them in fairly small chunks anyway, switch it to us

firmware: convert Ambassador ATM driver to request_firmware()

Since it had various regions to be loaded to separate addresses, and it
wanted to do them in fairly small chunks anyway, switch it to use the
new ihex code. Encode the start address in the first record.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>

show more ...


1234567