| #
15dbb5a3 |
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
7a9f8f93 |
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
90890687 |
| 28-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
e5dfa928 |
| 28-Oct-2005 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
|
|
Revision tags: v2.6.14 |
|
| #
9cec58dc |
| 20-Oct-2005 |
Tony Luck <tony.luck@intel.com> |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
l
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
show more ...
|
| #
312f5726 |
| 20-Oct-2005 |
Dave Airlie <airlied@starflyer.(none)> |
merge Linus head tree into my drm tree and fix up conflicts
|
|
Revision tags: v2.6.14-rc5, v2.6.14-rc4 |
|
| #
dcbf8477 |
| 10-Oct-2005 |
Ralf Baechle <ralf@linux-mips.org> |
[PATCH] mipsnet: Virtual ethernet driver for MIPSsim.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
drivers/net/Kconfig | 8 +
drivers/net/Makefile | 1
drivers/net/mipsnet.c | 371 +
[PATCH] mipsnet: Virtual ethernet driver for MIPSsim.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
drivers/net/Kconfig | 8 +
drivers/net/Makefile | 1
drivers/net/mipsnet.c | 371 ++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/mipsnet.h | 127 +++++++++++++++++
4 files changed, 507 insertions(+)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
show more ...
|
| #
cff6bf97 |
| 18-Oct-2005 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
|
| #
7217cbcc |
| 14-Oct-2005 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
b6ec995a |
| 12-Oct-2005 |
Paul Mackerras <paulus@samba.org> |
Merge from Linus' tree
|
| #
012e060c |
| 06-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
2ee73cc2 |
| 04-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
3c8c7b2f |
| 04-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream-fixes'
|
| #
0fbbbf2b |
| 04-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge libata upstream (which includes C/H/S support) include irq-pio branch.
Merge branch 'upstream'
|
| #
2b235826 |
| 04-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.14-rc3 |
|
| #
eb693d29 |
| 29-Sep-2005 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
| #
1f26dac3 |
| 28-Sep-2005 |
David S. Miller <davem@davemloft.net> |
[NET]: Add Sun Cassini driver.
Written by Adrian Sun (asun@darksunrising.com).
Ported to 2.6.x by Tom 'spot' Callaway <tcallawa@redhat.com>.
Further cleaned up and integrated by David S. Miller
Sig
[NET]: Add Sun Cassini driver.
Written by Adrian Sun (asun@darksunrising.com).
Ported to 2.6.x by Tom 'spot' Callaway <tcallawa@redhat.com>.
Further cleaned up and integrated by David S. Miller
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
| #
4e0c1159 |
| 25-Sep-2005 |
Dave Airlie <airlied@starflyer.(none)> |
update from upstream
|
| #
bb40dcbb |
| 24-Sep-2005 |
Andy Fleming <afleming@freescale.com> |
[netdrvr gianfar] use new phy layer
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
|
|
Revision tags: v2.6.14-rc2, v2.6.14-rc1 |
|
| #
f89efd52 |
| 09-Sep-2005 |
Matt Porter <mporter@kernel.crashing.org> |
[PATCH] Add rapidio net driver
Adds an "Ethernet" driver which sends Ethernet packets over the standard
RapidIO messaging. This depends on the core RIO patch for mailbox/doorbell
access.
Signed-of
[PATCH] Add rapidio net driver
Adds an "Ethernet" driver which sends Ethernet packets over the standard
RapidIO messaging. This depends on the core RIO patch for mailbox/doorbell
access.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
show more ...
|
| #
d7f6884a |
| 14-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
d344c5e0 |
| 10-Sep-2005 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Manual merge with Linus
|
| #
344a0761 |
| 08-Sep-2005 |
Tony Luck <tony.luck@intel.com> |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
|
| #
1d6ae775 |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
142e27fc |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|