|
Revision tags: v2.6.16-rc6, v2.6.16-rc5, v2.6.16-rc4, v2.6.16-rc3, v2.6.16-rc2 |
|
| #
292dd876 |
| 27-Jan-2006 |
Len Brown <len.brown@intel.com> |
Pull release into acpica branch
|
| #
0a0fc0dd |
| 24-Jan-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
| #
944d7955 |
| 19-Jan-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
| #
d65177c1 |
| 17-Jan-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
|
| #
ea9b395f |
| 17-Jan-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
| #
0825788f |
| 17-Jan-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
|
Revision tags: v2.6.16-rc1 |
|
| #
f1dccedc |
| 15-Jan-2006 |
Mauro Carvalho Chehab <mchehab@infradead.org> |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
69eebed2 |
| 13-Jan-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
| #
46b86a2d |
| 13-Jan-2006 |
Joe Perches <joe@perches.com> |
[NET]: Use NIP6_FMT in kernel.h
There are errors and inconsistency in the display of NIP6 strings.
ie: net/ipv6/ip6_flowlabel.c
There are errors and inconsistency in the display of NIPQUAD strings
[NET]: Use NIP6_FMT in kernel.h
There are errors and inconsistency in the display of NIP6 strings.
ie: net/ipv6/ip6_flowlabel.c
There are errors and inconsistency in the display of NIPQUAD strings too.
ie: net/netfilter/nf_conntrack_ftp.c
This patch:
adds NIP6_FMT to kernel.h
changes all code to use NIP6_FMT
fixes net/ipv6/ip6_flowlabel.c
adds NIPQUAD_FMT to kernel.h
fixes net/netfilter/nf_conntrack_ftp.c
changes a few uses of "%u.%u.%u.%u" to NIPQUAD_FMT for symmetry to NIP6_FMT
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
| #
94bc2be3 |
| 12-Jan-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
|
| #
123656d4 |
| 07-Jan-2006 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge with Linus' kernel.
|
| #
ed03f430 |
| 07-Jan-2006 |
Len Brown <len.brown@intel.com> |
Pull pnpacpi into acpica branch
|
| #
25da0974 |
| 06-Jan-2006 |
Len Brown <len.brown@intel.com> |
Auto-update from upstream
|
| #
fed8bf19 |
| 05-Jan-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
5c3eee79 |
| 05-Jan-2006 |
Tony Luck <tony.luck@intel.com> |
Auto-update from upstream
|
| #
0a75c23a |
| 05-Jan-2006 |
Jody McIntyre <scjody@modernduck.com> |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
d347da0d |
| 04-Jan-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
|
|
Revision tags: v2.6.15 |
|
| #
14c85021 |
| 26-Dec-2005 |
Arnaldo Carvalho de Melo <acme@mandriva.com> |
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
To help in reducing the number of include dependencies, several files were
touched as they were getting needed headers indire
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
To help in reducing the number of include dependencies, several files were
touched as they were getting needed headers indirectly for stuff they use.
Thanks also to Alan Menegotto for pointing out that net/dccp/proto.c had
linux/dccp.h include twice.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
|
Revision tags: v2.6.15-rc7, v2.6.15-rc6, v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2, v2.6.15-rc1 |
|
| #
2fc29911 |
| 06-Nov-2005 |
Thomas Gleixner <tglx@mtd.linutronix.de> |
Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/
|
|
Revision tags: v2.6.14, v2.6.14-rc5, v2.6.14-rc4, v2.6.14-rc3 |
|
| #
4e0c1159 |
| 24-Sep-2005 |
Dave Airlie <airlied@starflyer.(none)> |
update from upstream
|
|
Revision tags: v2.6.14-rc2 |
|
| #
d7f6884a |
| 14-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
|
Revision tags: v2.6.14-rc1 |
|
| #
d344c5e0 |
| 09-Sep-2005 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Manual merge with Linus
|
| #
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/
|
| #
c324b44c |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|