Linus Torvalds
ba1eb95cf3
Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
x86: headers cleanup - setup.h
emu101k1.h: fix duplicate include of <linux/types.h>
compiler-gcc4: conditionalize #error on __KERNEL__
remove __KERNEL_STRICT_NAMES
make netfilter use strict integer types
make drm headers use strict integer types
make MTD headers use strict integer types
make most exported headers use strict integer types
make exported headers use strict posix types
unconditionally include asm/types.h from linux/types.h
make linux/types.h as assembly safe
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
headers_check fix cleanup: linux/reiserfs_fs.h
headers_check fix cleanup: linux/nubus.h
headers_check fix cleanup: linux/coda_psdev.h
headers_check fix: x86, setup.h
headers_check fix: x86, prctl.h
headers_check fix: linux/reinserfs_fs.h
headers_check fix: linux/socket.h
headers_check fix: linux/nubus.h
...
Manually fix trivial conflicts in:
include/linux/netfilter/xt_limit.h
include/linux/netfilter/xt_statistic.h
|
2009-03-26 16:11:41 -07:00 |
| .. |
|
boot
|
kbuild: use KECHO convenience echo
|
2008-12-03 21:32:01 +01:00 |
|
configs
|
Blackfin arch: disable legacy /proc/scsi/ support by default
|
2009-03-06 00:27:17 +08:00 |
|
include/asm
|
Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
|
2009-03-26 16:11:41 -07:00 |
|
kernel
|
Merge branches 'irq/genirq' and 'linus' into irq/core
|
2009-03-16 09:20:13 +01:00 |
|
lib
|
Blackfin arch: merge adeos blackfin part to arch/blackfin/
|
2009-01-07 23:14:39 +08:00 |
|
mach-bf518
|
Blackfin arch: SPI_MMC is now mainlined MMC_SPI
|
2009-03-06 00:27:57 +08:00 |
|
mach-bf527
|
Blackfin arch: SPI_MMC is now mainlined MMC_SPI
|
2009-03-06 00:27:57 +08:00 |
|
mach-bf533
|
Blackfin arch: SPI_MMC is now mainlined MMC_SPI
|
2009-03-06 00:27:57 +08:00 |
|
mach-bf537
|
Blackfin arch: SPI_MMC is now mainlined MMC_SPI
|
2009-03-06 00:27:57 +08:00 |
|
mach-bf538
|
Blackfin arch: add stubs for anomalies 447 and 448
|
2009-03-06 00:20:49 +08:00 |
|
mach-bf548
|
Blackfin arch: update anomaly sheets to match latest public info
|
2009-03-04 17:36:49 +08:00 |
|
mach-bf561
|
Blackfin arch: SPI_MMC is now mainlined MMC_SPI
|
2009-03-06 00:27:57 +08:00 |
|
mach-common
|
Blackfin arch: remove duplicated ANOMALY_05000448 ifdef check
|
2009-03-06 00:24:01 +08:00 |
|
mm
|
Blackfin arch: mark init_pda as __init as only __init funcs all it
|
2009-03-05 18:45:07 +08:00 |
|
oprofile
|
Blackfin arch: remove hardware PM code, oprofile not use it
|
2009-01-07 23:14:39 +08:00 |
|
Kconfig
|
Blackfin arch: PM_BFIN_WAKE_GP: update help
|
2009-03-05 16:45:55 +08:00 |
|
Kconfig.debug
|
Blackfin arch: use common KGDB_TESTS rather than our own KGDB_TESTCASE
|
2009-03-02 18:14:47 +08:00 |
|
Makefile
|
Blackfin arch: line up machine-/cpu- vars after BF54xM addition
|
2009-02-04 16:49:45 +08:00 |