OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers
History
Linus Torvalds 2e1ca21d46 Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild 
* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
  kbuild: remove obsoleted scripts/reference_* files
  kbuild: fix make help & make *pkg
  kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
  Kconfig: remove the CONFIG_CC_ALIGN_* options
  kbuild: add -fverbose-asm to i386 Makefile
  kbuild: clean-up genksyms
  kbuild: Lindent genksyms.c
  kbuild: fix genksyms build error
  kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
  kbuild: replace PHONY with FORCE
  kbuild: Fix bug in crc symbol generating of kernel and modules
  kbuild: change kbuild to not rely on incorrect GNU make behavior
  kbuild: when warning symbols exported twice now tell user this is the problem
  kbuild: fix make dir/file.xx when asm symlink is missing
  kbuild: in the section mismatch check try harder to find symbols
  kbuild: fix section mismatch check for unwind on IA64
  kbuild: kill false positives from section mismatch warnings for powerpc
  kbuild: kill trailing whitespace in modpost & friends
  kbuild: small update of allnoconfig description
  kbuild: make namespace.pl CROSS_COMPILE happy
  ...

Trivial conflict in arch/ppc/boot/Makefile manually fixed up
 		2006-03-25 08:48:48 -08:00
..
acorn
…
acpi fix typos "wich" -> "which" 2006-03-24 18:23:14 +01:00
amba
…
atm Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild 2006-03-25 08:48:48 -08:00
base [PATCH] Check if cpu can be onlined before calling smp_prepare_cpu() 2006-03-25 08:23:01 -08:00
block Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-03-25 08:41:09 -08:00
bluetooth
…
cdrom [PATCH] Remove MODULE_PARM 2006-03-25 08:22:52 -08:00
char Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-03-25 08:41:09 -08:00
connector [PATCH] sem2mutex: drivers: raw, connector, dcdbas, ppp_generic 2006-03-23 07:38:10 -08:00
cpufreq
…
crypto [CRYPTO] api: Align tfm context as wide as possible 2006-03-21 20:14:08 +11:00
dio [PATCH] hp300: fix driver_register() return handling, remove dio_module_init() 2006-03-25 08:22:53 -08:00
edac [PATCH] EDAC: disable sysfs interface 2006-03-14 07:57:18 -08:00
eisa [PATCH] EISA: Ignore generated file drivers/eisa/devlist.h 2006-03-25 08:23:01 -08:00
fc4
…
firmware [PATCH] sem2mutex: drivers: raw, connector, dcdbas, ppp_generic 2006-03-23 07:38:10 -08:00
hwmon [PATCH] s/;;/;/g 2006-03-24 07:33:24 -08:00
i2c [PATCH] s/;;/;/g 2006-03-24 07:33:24 -08:00
ide [PATCH] ide: fix section mismatch warning 2006-03-25 08:22:53 -08:00
ieee1394
…
infiniband Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2006-03-21 09:31:48 -08:00
input Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-03-25 08:41:09 -08:00
isdn Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-03-25 08:41:09 -08:00
macintosh [PATCH] macintosh: tidy-up driver_register() return values 2006-03-23 14:41:04 +11:00
mca
…
md Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-03-25 08:41:09 -08:00
media Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb 2006-03-25 08:37:36 -08:00
message [PATCH] i2o_dump_hrt() output cleanup 2006-03-25 08:22:58 -08:00
mfd [PATCH] show MCP menu only on ARCH_SA1100 2006-03-24 07:33:28 -08:00
misc
…
mmc [PATCH] Remove MODULE_PARM 2006-03-25 08:22:52 -08:00
mtd [PATCH] Remove MODULE_PARM 2006-03-25 08:22:52 -08:00
net Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2006-03-25 08:39:20 -08:00
nubus
…
oprofile [PATCH] more for_each_cpu() conversions 2006-03-23 07:38:17 -08:00
parisc BUG_ON() Conversion in drivers/parisc/ 2006-03-24 18:52:10 +01:00
parport [SERIAL] Merge avlab serial board entries in parport_serial 2006-03-20 20:08:22 +00:00
pci [PATCH] acpiphp: fix acpi_path_name 2006-03-23 14:35:17 -08:00
pcmcia [PATCH] handle errors returned by platform_get_irq*() 2006-03-20 13:42:57 -08:00
pnp [PATCH] Fix memory leak in isapnp 2006-03-25 08:23:00 -08:00
rapidio
…
s390 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-03-25 08:41:09 -08:00
sbus [SPARC]: Respect vm_page_prot in io_remap_page_range(). 2006-03-22 01:15:13 -08:00
scsi [PATCH] git-scsi-misc: min() warning fix 2006-03-25 08:23:02 -08:00
serial Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-03-25 08:41:09 -08:00
sh
…
sn Pull sem2mutex-ioc4 into release branch 2006-03-21 08:17:15 -08:00
spi
…
tc [PATCH] kill _INLINE_ 2006-03-23 07:38:16 -08:00
telephony
…
usb Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-03-25 08:41:09 -08:00
video Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild 2006-03-25 08:48:48 -08:00
w1 fix typos "wich" -> "which" 2006-03-24 18:23:14 +01:00
zorro [PATCH] amiga: fix driver_register() return handling, remove zorro_module_init() 2006-03-25 08:22:53 -08:00
Kconfig
…
Makefile
…