UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch/arm
History
Linus Torvalds 0191b625ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
 		2008-12-28 12:49:40 -08:00
..
boot ftrace: rename FTRACE to FUNCTION_TRACER 2008-10-20 18:27:03 +02:00
common [ARM] arch/arm/common/sa1111.c: Correct error handling code 2008-12-14 11:03:46 +00:00
configs [ARM] pxa/corgi: update default config to exclude tosa from being built 2008-11-26 12:51:42 +08:00
include/asm [ARM] 5340/1: fix stack placement after noexecstack changes 2008-12-06 08:32:02 +00:00
kernel [ARM] Ensure linux/hardirqs.h is included where required 2008-12-15 10:34:48 +00:00
lib Merge branch 'ptebits' into devel 2008-10-09 21:31:56 +01:00
mach-aaec2000 [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
mach-at91 [ARM] 5326/1: AFEB9260: Fix for i2c_board_info structure 2008-10-30 15:43:42 +00:00
mach-clps711x [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants 2008-11-13 15:05:03 +00:00
mach-clps7500 [ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants 2008-11-13 15:04:52 +00:00
mach-davinci Merge branch 's3c-move' into devel 2008-10-14 22:24:51 +01:00
mach-ebsa110 [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
mach-ep93xx [ARM] ep93xx: fix OHCI DMA mask 2008-10-30 14:41:48 +00:00
mach-footbridge Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-h720x [ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants 2008-11-13 15:04:52 +00:00
mach-imx [ARM] gpio_free might sleep, arm architecture 2008-10-30 14:41:50 +00:00
mach-integrator [ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants 2008-11-13 14:47:59 +00:00
mach-iop13xx iop-adma: use iop_paranoia() for debug BUG_ONs 2008-11-11 13:12:33 -07:00
mach-iop32x [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
mach-iop33x [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
mach-ixp4xx IXP4xx: move common debugging from network drivers to QMGR module. 2008-12-22 00:48:00 +01:00
mach-ixp23xx Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-ixp2000 genirq: fix name space collisions of nr_irqs in arch/* 2008-10-16 16:53:30 +02:00
mach-kirkwood [ARM] 5321/1: Kirkwood: fix typo in Makefile 2008-10-23 19:58:19 +01:00
mach-ks8695 [ARM] gpio_free might sleep, arm architecture 2008-10-30 14:41:50 +00:00
mach-l7200 [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
mach-lh7a40x Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-loki Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-10-11 10:09:45 -07:00
mach-msm [ARM] msm: vreg interface to msm7k pmic 2008-10-22 02:41:00 -07:00
mach-mv78xx0 [ARM] mv78xx0: force link speed/duplex on eth2/eth3 2008-10-19 14:29:05 -04:00
mach-mx2 i.MX2: make SoC devices globally available 2008-09-09 10:19:41 +02:00
mach-mx3 [ARM] mx31ads: Add missing include 2008-10-30 15:58:09 +01:00
mach-netx Merge branch 'pxa-all' into devel 2008-10-09 21:33:02 +01:00
mach-ns9xxx [ARM] gpio_free might sleep, arm architecture 2008-10-30 14:41:50 +00:00
mach-omap1 [ARM] omap: fix a pile of issues 2008-12-01 17:40:54 +00:00
mach-omap2 ARM: OMAP: Fix compiler warnings in gpmc.c 2008-11-04 13:35:06 -08:00
mach-orion5x [ARM] gpio_free might sleep, arm architecture 2008-10-30 14:41:50 +00:00
mach-pnx4008 [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
mach-pxa Merge branch 'topic/asoc' into to-push 2008-12-25 11:40:25 +01:00
mach-realview [ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants 2008-11-13 14:47:59 +00:00
mach-rpc [ARM] mm: enable sparsemem on clps7500 and RiscPC 2008-10-01 17:24:04 +01:00
mach-s3c2400 [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
mach-s3c2410 spi: fix spi_s3c24xx_gpio num_chipselect 2008-12-01 19:55:24 -08:00
mach-s3c2412 Merge branch 's3c-move' into devel 2008-10-14 22:24:51 +01:00
mach-s3c2440 Merge branch 's3c-move' into devel 2008-10-14 22:24:51 +01:00
mach-s3c2442 Merge branch 's3c-move' into devel 2008-10-14 22:24:51 +01:00
mach-s3c2443 Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux 2008-10-17 14:29:03 +01:00
mach-sa1100 ide: remove dead <asm-arm/arch-sa1100/ide.h> 2008-10-17 18:09:15 +02:00
mach-shark [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
mach-versatile [ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants 2008-11-13 14:47:59 +00:00
mm [ARM] Ensure linux/hardirqs.h is included where required 2008-12-15 10:34:48 +00:00
nwfpe [ARM] Convert asm/uaccess.h to linux/uaccess.h 2008-09-06 11:35:55 +01:00
oprofile [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
plat-iop [ARM] iop: iop3xx needs registers mapped uncached+unbuffered 2008-11-09 11:18:36 +00:00
plat-mxc [ARM] MXC: Fix mxc_gpio_get(), which must read PSR register instead DR. 2008-10-30 15:56:35 +01:00
plat-omap [ARM] omap: fix a pile of issues 2008-12-01 17:40:54 +00:00
plat-orion [ARM] Orion: fix bug in pcie configuration cycle function field mask 2008-12-02 16:53:26 -05:00
plat-s3c [ARM] S3C24XX: Additional include moves 2008-10-07 23:09:51 +01:00
plat-s3c24xx Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux 2008-10-17 14:29:03 +01:00
tools [ARM] Update mach-types 2008-09-25 10:12:25 +01:00
vfp [ARM] 5227/1: Add the ENDPROC declarations to the .S files 2008-09-01 12:06:34 +01:00
Kconfig Merge commit 'v2.6.28-rc2' into tracing/urgent 2008-10-27 10:50:54 +01:00
Kconfig-nommu [ARM] 4532/1: allow configuration of processor ID 2007-10-12 23:43:02 +01:00
Kconfig.debug [ARM] CONFIG_DEBUG_STACK_USAGE 2008-01-26 14:50:06 +00:00
Makefile [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM 2008-10-22 02:39:32 -07:00