History log of /openbmc/linux/net/atm/proc.c (Results 376 – 396 of 396)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.19, v2.6.19-rc6, v2.6.19-rc5, v2.6.19-rc4, v2.6.19-rc3, v2.6.19-rc2, v2.6.19-rc1, v2.6.18
# 0612ec48 19-Sep-2006 Dmitry Torokhov <dtor@insightbb.com>

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


# 9b4f2e95 17-Sep-2006 Stefan Richter <stefanr@s5r6.in-berlin.de>

ieee1394: merge from Linus

Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed

ieee1394: merge from Linus

Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

show more ...


Revision tags: v2.6.18-rc7
# 115b384c 05-Sep-2006 Dave Jones <davej@redhat.com>

Merge ../linus


# 23e735bc 05-Sep-2006 Dave Jones <davej@redhat.com>

Merge ../linus


Revision tags: v2.6.18-rc6
# aa43f779 31-Aug-2006 Paul Mackerras <paulus@samba.org>

Merge branch 'merge'


# 0a7d5f8c 30-Aug-2006 David Woodhouse <dwmw2@infradead.org>

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


# 83b7a664 29-Aug-2006 Steven Whitehouse <swhiteho@redhat.com>

Merge branch 'master' into gfs2


Revision tags: v2.6.18-rc5
# 8ce7a9c1 27-Aug-2006 James Bottomley <jejb@mulgrave.il.steeleye.com>

Merge ../linux-2.6


# 69758820 22-Aug-2006 John W. Linville <linville@tuxdriver.com>

Merge branch 'from-linus' into upstream


# 499792ec 19-Aug-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'upstream-fixes' into upstream


# d14b50cc 19-Aug-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'master' into upstream-fixes


# 49666145 19-Aug-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'upstream-fixes' into upstream


# 41ace186 19-Aug-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'master' into upstream-fixes


# ef7d1b24 18-Aug-2006 Greg Kroah-Hartman <gregkh@suse.de>

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


# b9c6e3e9 15-Aug-2006 Kevin Hilman <khilman@mvista.com>

[ATM]: Compile error on ARM

atm_proc_exit() is declared as __exit, and thus in .exit.text. On
some architectures (ARM) .exit.text is discarded at compile time, and
since atm_proc_exit() is called b

[ATM]: Compile error on ARM

atm_proc_exit() is declared as __exit, and thus in .exit.text. On
some architectures (ARM) .exit.text is discarded at compile time, and
since atm_proc_exit() is called by some other __init functions, it
results in a link error.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

show more ...


Revision tags: v2.6.18-rc4, v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1
# 05668381 03-Jul-2006 Sam Ravnborg <sam@mars.ravnborg.org>

Merge branch 'master' of /home/sam/kernel/linux-2.6/


# 026477c1 03-Jul-2006 Trond Myklebust <Trond.Myklebust@netapp.com>

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/


# 0a1340c1 03-Jul-2006 Steven Whitehouse <swhiteho@redhat.com>

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

Conflicts:

include/linux/kernel.h


# 22a3e233 30-Jun-2006 Linus Torvalds <torvalds@g5.osdl.org>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_en

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S

show more ...


# 6ab3d562 30-Jun-2006 Jörn Engel <joern@wohnheim.fh-wedel.de>

Remove obsolete #include <linux/config.h>

Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>


Revision tags: v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4, v2.6.17-rc3, v2.6.17-rc2, v2.6.17-rc1, v2.6.16, v2.6.16-rc6, v2.6.16-rc5, v2.6.16-rc4, v2.6.16-rc3, v2.6.16-rc2, v2.6.16-rc1, v2.6.15, 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, v2.6.14, v2.6.14-rc5, v2.6.14-rc4, v2.6.14-rc3, v2.6.14-rc2, v2.6.14-rc1, v2.6.13, v2.6.13-rc7, v2.6.13-rc6, v2.6.13-rc5, v2.6.13-rc4, v2.6.13-rc3, v2.6.13-rc2, v2.6.13-rc1, v2.6.12, v2.6.12-rc6, v2.6.12-rc5, v2.6.12-rc4, v2.6.12-rc3, v2.6.12-rc2
# 1da177e4 16-Apr-2005 Linus Torvalds <torvalds@ppc970.osdl.org>

Linux-2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in

Linux-2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

show more ...


1...<<111213141516