diff --git a/[refs] b/[refs] index 4296b0235033..3dc16125726a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4da0bd736552e6377b407b3c3d3ae518ebbdd269 +refs/heads/master: d8a0f1b0af67679bba886784de10d8c21acc4e0e diff --git a/trunk/Documentation/devicetree/bindings/net/stmmac.txt b/trunk/Documentation/devicetree/bindings/net/stmmac.txt deleted file mode 100644 index 1f62623f8c3f..000000000000 --- a/trunk/Documentation/devicetree/bindings/net/stmmac.txt +++ /dev/null @@ -1,28 +0,0 @@ -* STMicroelectronics 10/100/1000 Ethernet driver (GMAC) - -Required properties: -- compatible: Should be "st,spear600-gmac" -- reg: Address and length of the register set for the device -- interrupt-parent: Should be the phandle for the interrupt controller - that services interrupts for this device -- interrupts: Should contain the STMMAC interrupts -- interrupt-names: Should contain the interrupt names "macirq" - "eth_wake_irq" if this interrupt is supported in the "interrupts" - property -- phy-mode: String, operation mode of the PHY interface. - Supported values are: "mii", "rmii", "gmii", "rgmii". - -Optional properties: -- mac-address: 6 bytes, mac address - -Examples: - - gmac0: ethernet@e0800000 { - compatible = "st,spear600-gmac"; - reg = <0xe0800000 0x8000>; - interrupt-parent = <&vic1>; - interrupts = <24 23>; - interrupt-names = "macirq", "eth_wake_irq"; - mac-address = [000000000000]; /* Filled in by U-Boot */ - phy-mode = "gmii"; - }; diff --git a/trunk/Documentation/hwmon/w83627ehf b/trunk/Documentation/hwmon/w83627ehf index ceaf6f652b00..3f44dbdfda70 100644 --- a/trunk/Documentation/hwmon/w83627ehf +++ b/trunk/Documentation/hwmon/w83627ehf @@ -50,7 +50,7 @@ W83627DHG, W83627DHG-P, W83627UHG, W83667HG, W83667HG-B, W83667HG-I (NCT6775F), and NCT6776F super I/O chips. We will refer to them collectively as Winbond chips. -The chips implement 3 to 4 temperature sensors (9 for NCT6775F and NCT6776F), +The chips implement 2 to 4 temperature sensors (9 for NCT6775F and NCT6776F), 2 to 5 fan rotation speed sensors, 8 to 10 analog voltage sensors, one VID (except for 627UHG), alarms with beep warnings (control unimplemented), and some automatic fan regulation strategies (plus manual fan control mode). @@ -143,13 +143,8 @@ pwm[1-4]_min_output - minimum fan speed (range 1 - 255), when the temperature pwm[1-4]_stop_time - how many milliseconds [ms] must elapse to switch corresponding fan off. (when the temperature was below defined range). -pwm[1-4]_start_output-minimum fan speed (range 1 - 255) when spinning up -pwm[1-4]_step_output- rate of fan speed change (1 - 255) -pwm[1-4]_stop_output- minimum fan speed (range 1 - 255) when spinning down -pwm[1-4]_max_output - maximum fan speed (range 1 - 255), when the temperature - is above defined range. -Note: last six functions are influenced by other control bits, not yet exported +Note: last two functions are influenced by other control bits, not yet exported by the driver, so a change might not have any effect. Implementation Details diff --git a/trunk/Documentation/hwmon/zl6100 b/trunk/Documentation/hwmon/zl6100 index a4e8d90f59f6..51f76a189fee 100644 --- a/trunk/Documentation/hwmon/zl6100 +++ b/trunk/Documentation/hwmon/zl6100 @@ -88,12 +88,14 @@ Module parameters delay ----- -Intersil/Zilker Labs DC-DC controllers require a minimum interval between I2C -bus accesses. According to Intersil, the minimum interval is 2 ms, though 1 ms -appears to be sufficient and has not caused any problems in testing. The problem -is known to affect all currently supported chips. For manual override, the -driver provides a writeable module parameter, 'delay', which can be used to set -the interval to a value between 0 and 65,535 microseconds. +Some Intersil/Zilker Labs DC-DC controllers require a minimum interval between +I2C bus accesses. According to Intersil, the minimum interval is 2 ms, though +1 ms appears to be sufficient and has not caused any problems in testing. +The problem is known to affect ZL6100, ZL2105, and ZL2008. It is known not to +affect ZL2004 and ZL6105. The driver automatically sets the interval to 1 ms +except for ZL2004 and ZL6105. To enable manual override, the driver provides a +writeable module parameter, 'delay', which can be used to set the interval to +a value between 0 and 65,535 microseconds. Sysfs entries diff --git a/trunk/Documentation/networking/mac80211-auth-assoc-deauth.txt b/trunk/Documentation/networking/mac80211-auth-assoc-deauth.txt deleted file mode 100644 index e0a2aa585ca3..000000000000 --- a/trunk/Documentation/networking/mac80211-auth-assoc-deauth.txt +++ /dev/null @@ -1,99 +0,0 @@ -# -# This outlines the Linux authentication/association and -# deauthentication/disassociation flows. -# -# This can be converted into a diagram using the service -# at http://www.websequencediagrams.com/ -# - -participant userspace -participant mac80211 -participant driver - -alt authentication needed (not FT) -userspace->mac80211: authenticate - -alt authenticated/authenticating already -mac80211->driver: sta_state(AP, not-exists) -mac80211->driver: bss_info_changed(clear BSSID) -else associated -note over mac80211,driver -like deauth/disassoc, without sending the -BA session stop & deauth/disassoc frames -end note -end - -mac80211->driver: config(channel, non-HT) -mac80211->driver: bss_info_changed(set BSSID, basic rate bitmap) -mac80211->driver: sta_state(AP, exists) - -alt no probe request data known -mac80211->driver: TX directed probe request -driver->mac80211: RX probe response -end - -mac80211->driver: TX auth frame -driver->mac80211: RX auth frame - -alt WEP shared key auth -mac80211->driver: TX auth frame -driver->mac80211: RX auth frame -end - -mac80211->driver: sta_state(AP, authenticated) -mac80211->userspace: RX auth frame - -end - -userspace->mac80211: associate -alt authenticated or associated -note over mac80211,driver: cleanup like for authenticate -end - -alt not previously authenticated (FT) -mac80211->driver: config(channel, non-HT) -mac80211->driver: bss_info_changed(set BSSID, basic rate bitmap) -mac80211->driver: sta_state(AP, exists) -mac80211->driver: sta_state(AP, authenticated) -end -mac80211->driver: TX assoc -driver->mac80211: RX assoc response -note over mac80211: init rate control -mac80211->driver: sta_state(AP, associated) - -alt not using WPA -mac80211->driver: sta_state(AP, authorized) -end - -mac80211->driver: set up QoS parameters - -alt is HT channel -mac80211->driver: config(channel, HT params) -end - -mac80211->driver: bss_info_changed(QoS, HT, associated with AID) -mac80211->userspace: associated - -note left of userspace: associated now - -alt using WPA -note over userspace -do 4-way-handshake -(data frames) -end note -userspace->mac80211: authorized -mac80211->driver: sta_state(AP, authorized) -end - -userspace->mac80211: deauthenticate/disassociate -mac80211->driver: stop BA sessions -mac80211->driver: TX deauth/disassoc -mac80211->driver: flush frames -mac80211->driver: sta_state(AP,associated) -mac80211->driver: sta_state(AP,authenticated) -mac80211->driver: sta_state(AP,exists) -mac80211->driver: sta_state(AP,not-exists) -mac80211->driver: turn off powersave -mac80211->driver: bss_info_changed(clear BSSID, not associated, no QoS, ...) -mac80211->driver: config(non-HT channel type) -mac80211->userspace: disconnected diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 9be34c42b677..209a386214c2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1514,23 +1514,19 @@ F: drivers/mtd/devices/block2mtd.c BLUETOOTH DRIVERS M: Marcel Holtmann -M: Gustavo Padovan -M: Johan Hedberg +M: "Gustavo F. Padovan" L: linux-bluetooth@vger.kernel.org W: http://www.bluez.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git S: Maintained F: drivers/bluetooth/ BLUETOOTH SUBSYSTEM M: Marcel Holtmann -M: Gustavo Padovan -M: Johan Hedberg +M: "Gustavo F. Padovan" L: linux-bluetooth@vger.kernel.org W: http://www.bluez.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git S: Maintained F: net/bluetooth/ F: include/net/bluetooth/ @@ -1721,14 +1717,6 @@ F: include/linux/can/error.h F: include/linux/can/netlink.h F: include/linux/can/platform/ -CAPABILITIES -M: Serge Hallyn -L: linux-security-module@vger.kernel.org -S: Supported -F: include/linux/capability.h -F: security/capability.c -F: security/commoncap.c - CELL BROADBAND ENGINE ARCHITECTURE M: Arnd Bergmann L: linuxppc-dev@lists.ozlabs.org @@ -2364,15 +2352,6 @@ S: Supported F: drivers/gpu/drm/exynos F: include/drm/exynos* -EXYNOS MIPI DISPLAY DRIVERS -M: Inki Dae -M: Donghwa Lee -M: Kyungmin Park -L: linux-fbdev@vger.kernel.org -S: Maintained -F: drivers/video/exynos/exynos_mipi* -F: include/video/exynos_mipi* - DSCC4 DRIVER M: Francois Romieu L: netdev@vger.kernel.org @@ -2867,12 +2846,6 @@ S: Maintained F: drivers/media/video/m5mols/ F: include/media/m5mols.h -FUJITSU TABLET EXTRAS -M: Robert Gerlach -L: platform-driver-x86@vger.kernel.org -S: Maintained -F: drivers/platform/x86/fujitsu-tablet.c - FUSE: FILESYSTEM IN USERSPACE M: Miklos Szeredi L: fuse-devel@lists.sourceforge.net @@ -5890,7 +5863,6 @@ F: drivers/mmc/host/sdhci-s3c.c SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER M: Viresh Kumar -L: spear-devel@list.st.com L: linux-mmc@vger.kernel.org S: Maintained F: drivers/mmc/host/sdhci-spear.c @@ -6233,32 +6205,24 @@ F: drivers/tty/serial/sunzilog.h SPEAR PLATFORM SUPPORT M: Viresh Kumar -L: spear-devel@list.st.com -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear S: Maintained F: arch/arm/plat-spear/ SPEAR3XX MACHINE SUPPORT M: Viresh Kumar -L: spear-devel@list.st.com -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear S: Maintained F: arch/arm/mach-spear3xx/ SPEAR6XX MACHINE SUPPORT M: Rajeev Kumar -L: spear-devel@list.st.com -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear S: Maintained F: arch/arm/mach-spear6xx/ SPEAR CLOCK FRAMEWORK SUPPORT M: Viresh Kumar -L: spear-devel@list.st.com -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear S: Maintained F: arch/arm/mach-spear*/clock.c @@ -6267,8 +6231,6 @@ F: arch/arm/plat-spear/include/plat/clock.h SPEAR PAD MULTIPLEXING SUPPORT M: Viresh Kumar -L: spear-devel@list.st.com -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear S: Maintained F: arch/arm/plat-spear/include/plat/padmux.h diff --git a/trunk/Makefile b/trunk/Makefile index 1932984478c1..66d13c917bc7 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = +EXTRAVERSION = -rc6 NAME = Saber-toothed Squirrel # *DOCUMENTATION* diff --git a/trunk/arch/arm/mach-shmobile/board-ag5evm.c b/trunk/arch/arm/mach-shmobile/board-ag5evm.c index 8aea3a2dd889..068b754bc348 100644 --- a/trunk/arch/arm/mach-shmobile/board-ag5evm.c +++ b/trunk/arch/arm/mach-shmobile/board-ag5evm.c @@ -38,7 +38,6 @@ #include #include #include -#include #include