| #
7211bb9b |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
87199134 |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
328198ac |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
c2cc87ca |
| 04-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
c7fb577e |
| 31-Oct-2005 |
Tony Luck <tony.luck@intel.com> |
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
|
| #
53b2ec55 |
| 31-Oct-2005 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
1f04c0a2 |
| 31-Oct-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
| #
23fd0775 |
| 30-Oct-2005 |
Paul Mackerras <paulus@samba.org> |
Merge ../linux-2.6 by hand
|
| #
4e57b681 |
| 30-Oct-2005 |
Tim Schmielau <tim@physik3.uni-rostock.de> |
[PATCH] fix missing includes
I recently picked up my older work to remove unnecessary #includes of
sched.h, starting from a patch by Dave Jones to not include sched.h
from module.h. This reduces the
[PATCH] fix missing includes
I recently picked up my older work to remove unnecessary #includes of
sched.h, starting from a patch by Dave Jones to not include sched.h
from module.h. This reduces the number of indirect includes of sched.h
by ~300. Another ~400 pointless direct includes can be removed after
this disentangling (patch to follow later).
However, quite a few indirect includes need to be fixed up for this.
In order to feed the patches through -mm with as little disturbance as
possible, I've split out the fixes I accumulated up to now (complete for
i386 and x86_64, more archs to follow later) and post them before the real
patch. This way this large part of the patch is kept simple with only
adding #includes, and all hunks are independent of each other. So if any
hunk rejects or gets in the way of other patches, just drop it. My scripts
will pick it up again in the next round.
Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
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
|
| #
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/
|
| #
c324b44c |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
5a2cec83 |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
64e47488 |
| 08-Sep-2005 |
Len Brown <len.brown@intel.com> |
Merge linux-2.6 with linux-acpi-2.6
|
| #
e139aa59 |
| 06-Sep-2005 |
Bjorn Helgaas <bjorn.helgaas@hp.com> |
[PATCH] PNP: make pnp_dbg conditional directly on CONFIG_PNP_DEBUG
Seems pointless to require .c files to test CONFIG_PNP_DEBUG and
conditionally define DEBUG before including <linux/pnp.h>. Just t
[PATCH] PNP: make pnp_dbg conditional directly on CONFIG_PNP_DEBUG
Seems pointless to require .c files to test CONFIG_PNP_DEBUG and
conditionally define DEBUG before including <linux/pnp.h>. Just test
CONFIG_PNP_DEBUG directly in pnp.h.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
| #
c1b054d0 |
| 29-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
2fca877b |
| 29-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
/spare/repo/libata-dev branch 'v2.6.13'
|
|
Revision tags: v2.6.13, v2.6.13-rc7 |
|
| #
a8b3e6f1 |
| 18-Aug-2005 |
Dave Jones <davej@redhat.com> |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
2f058256 |
| 10-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
|
Revision tags: v2.6.13-rc6, v2.6.13-rc5, v2.6.13-rc4 |
|
| #
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, 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
|