Changes in TODO

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/drivers/bcma/TODO

94bd217e2d683719ab21a4ac117d8a1b91cbedc9 - Merge commit 'v3.1-rc2' into HEAD

Wed, 17 Aug 2011 18:14:01 +0200

Merge commit 'v3.1-rc2' into HEAD List of files: /linux/drivers/bcma/TODO

aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece - Merge branch 'next' into for-linus

Wed, 27 Jul 2011 09:54:47 +0200

Merge branch 'next' into for-linus List of files: /linux/drivers/bcma/TODO

74d83b7eedab14e4b963a2220ff76f98fa6d4cb8 - Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

Thu, 23 Jun 2011 22:20:51 +0200

Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus List of files: /linux/drivers/bcma/TODO

1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3 - Merge branch 'master' of /repos/git/net-next-2.6

Thu, 16 Jun 2011 17:01:10 +0200

Merge branch 'master' of /repos/git/net-next-2.6 List of files: /linux/drivers/bcma/TODO

a61944c251c3e68c4bbf6eb96ff61c7b286351c5 - Merge commit 'v3.0-rc1' into kbuild/kconfig

Wed, 08 Jun 2011 16:01:34 +0200

Merge commit 'v3.0-rc1' into kbuild/kconfig List of files: /linux/drivers/bcma/TODO

2e483528cebad089d0bb3f9aebb0ada22d968ffa - Merge commit 'v3.0-rc1' into kbuild/kbuild

Tue, 07 Jun 2011 15:37:51 +0200

Merge commit 'v3.0-rc1' into kbuild/kbuild List of files: /linux/drivers/bcma/TODO

aa72f6899b9fb3dc824c458234ae3507a60e462d - Merge branch 'for-3.0' into for-3.1

Mon, 06 Jun 2011 13:26:02 +0200

Merge branch 'for-3.0' into for-3.1 List of files: /linux/drivers/bcma/TODO

1102c660dd35725a11c7ca9365c237f2f42f6b30 - Merge branch 'linus' into perf/urgent

Thu, 26 May 2011 13:48:30 +0200

Merge branch 'linus' into perf/urgentMerge reason: Linus applied an overlapping commit: 5f2e8e2b0bf0: kernel/watchdog.c: Use proper ANSI C prototypesSo merge it in to make sure we can iterate the file without conflicts.Signed-off-by: Ingo Molnar List of files: /linux/drivers/bcma/TODO

5bdfdfeed5eed599a3ddc455f7c254a209ceae8d - Merge branches 'for-2639/i2c-eg20t', 'for-2639/i2c-shmobile', 'for-2639/i2c-tegra' and 'for-2639/i2c-nomadik2' into for-linus/2640/i2c

Wed, 25 May 2011 01:25:55 +0200

Merge branches 'for-2639/i2c-eg20t', 'for-2639/i2c-shmobile', 'for-2639/i2c-tegra' and 'for-2639/i2c-nomadik2' into for-linus/2640/i2c List of files: /linux/drivers/bcma/TODO

9fb4c7fbbcb1e947567d13b82e429ae47a46e337 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Tue, 24 May 2011 08:32:20 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 List of files: /linux/drivers/bcma/TODO

8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest

Tue, 24 May 2011 05:05:26 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest List of files: /linux/drivers/bcma/TODO

8ace5c4698ec8da53e69095596718d5a936433de - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

Mon, 23 May 2011 04:35:33 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest List of files: /linux/drivers/bcma/TODO

06f4e926d256d902dd9a53dcb400fd74974ce087 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

Fri, 20 May 2011 22:43:21 +0200

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: (1446 commits) macvlan: fix panic if lowerdev in a bond tg3: Add braces around 5906 workaround. tg3: Fix NETIF_F_LOOPBACK error macvlan: remove one synchronize_rcu() call networking: NET_CLS_ROUTE4 depends on INET irda: Fix error propagation in ircomm_lmp_connect_response() irda: Kill set but unused variable 'bytes' in irlan_check_command_param() irda: Kill set but unused variable 'clen' in ircomm_connect_indication() rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport() be2net: Kill set but unused variable 'req' in lancer_fw_download() irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication() atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined. rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer(). rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler() rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection() rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window() pkt_sched: Kill set but unused variable 'protocol' in tc_classify() isdn: capi: Use pr_debug() instead of ifdefs. tg3: Update version to 3.119 tg3: Apply rx_discards fix to 5719/5720 ...Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.cas per Davem. List of files: /linux/drivers/bcma/TODO

d46d4d64a85c6ff6118b33afd5d63bcb7e4be54a - Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Tue, 17 May 2011 04:49:41 +0200

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 List of files: /linux/drivers/bcma/TODO

e00cf3b9eb7839b952e434a75bff6b99e47337ac - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Mon, 16 May 2011 20:55:42 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davemConflicts: drivers/net/wireless/iwlwifi/iwl-agn-tx.c net/mac80211/sta_info.h List of files: /linux/drivers/bcma/TODO

8369ae33b705222aa05ab53c7d6b4458f4ed161b - bcma: add Broadcom specific AMBA bus driver

Mon, 09 May 2011 18:56:46 +0200

bcma: add Broadcom specific AMBA bus driverBroadcom has released cards based on a new AMBA-based bus type. From aprogramming point of view, this new bus type differs from AMBA and doesnot use AMBA common registers. It also differs enough from SSB. Wedecided that a new bus driver is needed to keep the code clean.In its current form, the driver detects devices present on the bus andregisters them in the system. It allows registering BCMA drivers forspecified bus devices and provides them basic operations. The bus driveritself includes two important bus managing drivers: ChipCommon coredriver and PCI(c) core driver. They are early used to allow correctinitialization.Currently code is limited to supporting buses on PCI(e) devices, howeverthe driver is designed to be used also on other hosts. The hostabstraction layer is implemented and already used for PCI(e).Support for PCI(e) hosts is working and seems to be stable (access to80211 core was tested successfully on a few devices). We can stilloptimize it by using some fixed windows, but this can be done laterwithout affecting any external code. Windows are just ranges in MMIOused for accessing cores on the bus.Cc: Greg KH Cc: Michael Büsch Cc: Larry Finger Cc: George Kashperko Cc: Arend van Spriel Cc: linux-arm-kernel@lists.infradead.orgCc: Russell King Cc: Arnd Bergmann Cc: Andy Botting Cc: linuxdriverproject Cc: linux-kernel@vger.kernel.org Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville List of files: /linux/drivers/bcma/TODO