#
343b0597 |
| 24-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
/spare/repo/netdev-2.6 branch 'ieee80211'
|
#
b2382b36 |
| 24-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
|
#
617e44fd |
| 24-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
Revision tags: v2.6.13-rc7 |
|
#
897874fa |
| 23-Aug-2005 |
Al Viro <viro@www.linux.org.uk> |
[PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64)
PMAC_BACKLIGHT is broken on ppc64; marked as such
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torval
[PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64)
PMAC_BACKLIGHT is broken on ppc64; marked as such
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
#
a8b3e6f1 |
| 18-Aug-2005 |
Dave Jones <davej@redhat.com> |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
a2e30e52 |
| 17-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
#
2f058256 |
| 10-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
#
c973b112 |
| 09-Aug-2005 |
David Woodhouse <dwmw2@shinybook.infradead.org> |
Merge with /shiny/git/linux-2.6/.git
|
Revision tags: v2.6.13-rc6 |
|
#
bcf7e34a |
| 03-Aug-2005 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
Revision tags: v2.6.13-rc5 |
|
#
de745fb2 |
| 31-Jul-2005 |
Jeff Garzik <jgarzik@pobox.com> |
/spare/repo/netdev-2.6 branch 'ieee80211'
|
#
a670fcb4 |
| 31-Jul-2005 |
Jeff Garzik <jgarzik@pobox.com> |
/spare/repo/netdev-2.6 branch 'master'
|
#
bdf242ee |
| 30-Jul-2005 |
Dave Airlie <airlied@starflyer.(none)> |
Merge ../linux-2.6/
|
Revision tags: v2.6.13-rc4 |
|
#
da28c120 |
| 28-Jul-2005 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
|
#
661299d9 |
| 28-Jul-2005 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge with Linus' 2.6 tree
|
#
2868bd28 |
| 28-Jul-2005 |
Roland Dreier <roland@eddore.topspincom.com> |
Merge /scratch/Ksrc/linux-git/
|
#
64c74de7 |
| 27-Jul-2005 |
Olaf Hering <olh@suse.de> |
[PATCH] ppc64: hide CONFIG_ADB
This bites me all day when I use our default config for ppc64. We use a patch to fix the compile errors and provide the CONFIG_MAC_EMUMOUSEBTN functionality (which is
[PATCH] ppc64: hide CONFIG_ADB
This bites me all day when I use our default config for ppc64. We use a patch to fix the compile errors and provide the CONFIG_MAC_EMUMOUSEBTN functionality (which is behind CONFIG_INPUT_ADBHID). But Benh doesnt like it.
http://ozlabs.org/pipermail/linuxppc64-dev/2005-March/003423.html
Just hide all the ADB parts from via-pmu on ppc64 instead.
drivers/macintosh/adbhid.c: In function `adbhid_init': drivers/macintosh/adbhid.c:1199: error: `_MACH_chrp' undeclared (first use in this function) drivers/macintosh/adbhid.c:1199: error: (Each undeclared identifier is reported only once drivers/macintosh/adbhid.c:1199: error: for each function it appears in.)
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
#
f7f24758 |
| 13-Jul-2005 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
|
Revision tags: v2.6.13-rc3 |
|
#
b3539219 |
| 06-Jul-2005 |
Artem B. Bityuckiy <dedekind@infradead.org> |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
|
Revision tags: v2.6.13-rc2 |
|
#
d2f64095 |
| 02-Jul-2005 |
David Woodhouse <dwmw2@shinybook.infradead.org> |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
ab997aae |
| 01-Jul-2005 |
Steve French <sfrench@hera.kernel.org> |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
c2d9b838 |
| 30-Jun-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Automerge with /usr/src/ntfs-2.6.git.
|
Revision tags: v2.6.13-rc1 |
|
#
8644d2a4 |
| 28-Jun-2005 |
Greg KH <greg@press.(none)> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
aa8f6dfd |
| 28-Jun-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
|
#
1bad3f40 |
| 28-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
#
716b4330 |
| 28-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
|