summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-07-20Merge commit 'nilfs2/for-next'Stephen Rothwell
2009-07-20Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2009-07-20Merge commit 'gfs2/master'Stephen Rothwell
2009-07-20Merge commit 'fuse/for-next'Stephen Rothwell
2009-07-20Merge commit 'ext4/next'Stephen Rothwell
2009-07-20Merge commit 'configfs/linux-next'Stephen Rothwell
Conflicts: fs/configfs/dir.c
2009-07-20Merge commit 'cifs/master'Stephen Rothwell
2009-07-20Merge commit 'xtensa/master'Stephen Rothwell
2009-07-20Merge commit 'sh/master'Stephen Rothwell
2009-07-20Merge commit 's390/features'Stephen Rothwell
2009-07-20Merge commit 'mips/mips-for-linux-next'Stephen Rothwell
Conflicts: arch/mips/cavium-octeon/dma-octeon.c arch/mips/cavium-octeon/executive/cvmx-helper-errata.c arch/mips/mm/tlbex.c arch/mips/sibyte/swarm/setup.c drivers/char/hw_random/Kconfig drivers/char/hw_random/Makefile drivers/dma/txx9dmac.c
2009-07-20Merge commit 'microblaze/next'Stephen Rothwell
2009-07-20Merge commit 'm68knommu/for-next'Stephen Rothwell
2009-07-20Merge commit 'm68k/for-next'Stephen Rothwell
2009-07-20Merge commit 'ia64/test'Stephen Rothwell
2009-07-20Merge commit 'cris/for-next'Stephen Rothwell
2009-07-20Merge commit 'thumb-2/thumb-2'Stephen Rothwell
2009-07-20Merge commit 'pxa/for-next'Stephen Rothwell
2009-07-20Merge commit 'davinci/for-next'Stephen Rothwell
2009-07-20Merge commit 'arm/devel'Stephen Rothwell
2009-07-20Merge commit 'input-current/for-linus'Stephen Rothwell
2009-07-20Merge branch 'quilt/usb.current'Stephen Rothwell
2009-07-20Merge branch 'quilt/driver-core.current'Stephen Rothwell
2009-07-20Merge commit 'kbuild-current/master'Stephen Rothwell
2009-07-20Merge commit 'net-current/master'Stephen Rothwell
2009-07-20Merge commit 'scsi-rc-fixes/master'Stephen Rothwell
2009-07-20Merge commit 'arm-current/master'Stephen Rothwell
2009-07-20Staging: HTC Dream: Makefile gluePavel Machek
This provides Makefile/Kconfig glue for HTC Dream staging parts. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: Brian Swetland <swetland@google.com> Cc: Iliyan Malchev <ibm@android.com> Cc: San Mehat <san@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: HTC Dream: add camera supportBrian Swetland
This patch adds driver for HTC Dream camera. I guess driver is slightly higher quality than usual for staging/ , but it is fairly big and I don't feel like doing all the cleanups myself. Also some parts can probably be removed, as they did not end up in shipping hardware.. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: Brian Swetland <swetland@google.com> Cc: Iliyan Malchev <ibm@android.com> Cc: San Mehat <san@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: HTC Dream: add qdsp supportIliyan Malchev
QDSP code is neccessarry for communication with some hardware components on HTC Dream, including camera hardware. It also drives DSP coproccessor. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: Brian Swetland <swetland@google.com> Cc: Iliyan Malchev <ibm@android.com> Cc: San Mehat <san@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: HTC Dream: add rpcrouter driverBrian Swetland
rpcrouter code is neccessarry for communication with QDSP and thus many hardware components on HTC Dream, including camera hardware. Cc: Brian Swetland <swetland@google.com> Cc: Iliyan Malchev <ibm@android.com> Cc: San Mehat <san@android.com> Signed-off-by: Pavel Machek <pavel@ucw.cz>
2009-07-20Staging: HTC Dream: add smd codeBrian Swetland
Infrastructure to support the Qualcomm "shared memory driver" interface, used to communicate with the baseband processor on MSM7k SoCs. The smd core provides low level facilities to interact with the shared memory comms region, and a "virtual serial channel" interface that higher level transports (AT command channel, rmnet virtual ethernet, qmi network management protocol, and oncrpc, for example) are routed over. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: Brian Swetland <swetland@google.com> Cc: Iliyan Malchev <ibm@android.com> Cc: San Mehat <san@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: vt6656: disable wpa related function due to memory failure of this ↵miaofng
part of codes Signed-off-by: miaofng <miaofng@126.com> Cc: Forest Bond <forest@alittletooquiet.net> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su/ieee80211: move rtl8192su specific code out from ieee80211.hBartlomiej Zolnierkiewicz
Move rtl8192su specific code out from ieee80211.h to ieee80211_r8192s.h. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su/ieee80211: ieee80211.h cleanupsBartlomiej Zolnierkiewicz
* remove unused / duplicated definitions * remove unused / used only once typedefs * fix comments, remove useless ones * convert defines to enums where appropriate * use __func__ instead of __FUNCTION__ * make some minor coding style fixes * misc cleanups Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su/ieee80211: remove unused ieee80211_wx_get_encode_ext()Bartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su/ieee80211: remove unused IEEE80211_PRINT_STR()Bartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su: remove NOT_YET ifdefsBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su/ieee80211: remove superfluous container_of definitionBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su/ieee80211: remove OPENSUSE_SLED ifdefsBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su: remove JOHN_DUMP[_TXDESC] ifdefsBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su: make private ieee80211 stack really privateBartlomiej Zolnierkiewicz
* rename ieee80211_{init,exit}() to ieee80211_debug_{init,exit}() * make private ieee80211 stack really private * cleanup Makefile * remove superfluous ieee80211_* defines * remove superfluous EXPORT_SYMBOLs Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8192su: remove more unused filesBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8187se/ieee80211: convert MMIE_TYPE_* defines to enumsBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8187se/ieee80211: ieee80211.h reorderingsBartlomiej Zolnierkiewicz
Reorder the code in ieee80211.h for easier comparisions with rtl8192su's version of the file. While at it: * use IEEE80211_4ADDR_LEN for IEEE80211_LEN definition * remove unused country_code_type_t typedef * make some minor coding style fixes Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8187se/ieee80211: switch to use <linux/ieee80211.h>Bartlomiej Zolnierkiewicz
While at it: * remove some commented out code * remove some unused definitions Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8187se: rename struct ieee80211_hdr_QOS to struct ↵Bartlomiej Zolnierkiewicz
ieee80211_hdr_4addrqos Rename struct ieee80211_hdr_QOS to struct ieee80211_hdr_4addrqos and QOS_ctl field to qos_ctl (to match the naming used by rtl8192su). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8187se: rename struct ieee80211_hdr_3addr_qos to struct ↵Bartlomiej Zolnierkiewicz
ieee80211_hdr_3addrqos Rename struct ieee80211_hdr_3addr_QOS to struct ieee80211_hdr_3addrqos and QOS_ctl field to qos_ctl (to match the naming used by rtl8192su). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8187se: rename struct ieee80211_hdr to struct ieee80211_hdr_4addrBartlomiej Zolnierkiewicz
ieee80211_hdr name is too generic so use ieee80211_hdr_4addr one instead (which matches the naming used by rtl8192su driver). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-20Staging: rtl8187se: remove ENABLE_IPS ifdefsBartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 17:43:47 +0000