26 Jul, 2011
1 commit
-
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
staging:iio:kfifo_buf fix double initialization of the ring device structure.
staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
staging:iio:imu fix missing register table index for some channels
spectra: enable device before poking it
staging: rts_pstor: Fix a miswriting
staging/lirc_bt829: Return -ENODEV when no hardware is found.
staging/lirc_parallel: remove pointless prototypes.
staging/lirc_parallel: fix panic on rmmod
staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
Staging: zram: Fix kunmapping order
Revert "gma500: Fix dependencies"
gma500: Add medfield header
gma500: wire up the mrst i2c bus from chip_info
gma500: Fix DPU build
gma500: Clean up the DPU config and make it runtime
gma500: resync with Medfield progress
gma500: Use the mrst helpers and power control for mode commit
gma500@ Fix backlight range error
gma500: More Moorestown muddle meddling means MM maybe might modeset
...Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
- Documentation/feature-removal-schedule.txt
- drivers/staging/bcm/headers.h
- drivers/staging/brcm80211/brcmfmac/dhd_linux.c
- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
- drivers/staging/brcm80211/brcmfmac/wl_iw.c
- drivers/staging/et131x/et131x_netdev.c
- drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
- drivers/staging/rtl8192e/r8192E.h
- drivers/staging/usbip/userspace/src/utils.h
06 Jul, 2011
5 commits
-
It was pointed out by 'make versioncheck' that some includes of
linux/version.h are not needed in drivers/staging/rtl8187se/,
drivers/staging/rtl8192e/, drivers/staging/rtl8192u/ &
drivers/staging/rtl8712/.
This patch removes them.Signed-off-by: Jesper Juhl
Signed-off-by: Greg Kroah-Hartman -
Fixes scripts/checkpatch.pl warning.
Signed-off-by: Michael Fiedler
Acked-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman -
Fixes warning from scripts/checkpatch.pl.
Signed-off-by: Michael Fiedler
Acked-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman -
According to scripts/checkpatch.pl, the __packed macro
from linux/compiler.h should be used.Signed-off-by: Michael Fiedler
Acked-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman -
There is already a macro defined in linux/compiler.h.
Signed-off-by: Michael Fiedler
Acked-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman
20 Jun, 2011
1 commit
-
Many stupid corrections of duplicated includes based on the output of
scripts/checkincludes.pl.Signed-off-by: Vitaliy Ivanov
Signed-off-by: Jiri Kosina
04 May, 2011
1 commit
-
Driver r8712u is unable to handle ad-hoc mode. The issue is that when
the driver first starts, there will not be an SSID for association.
The fix is to always call the "select and join from scan" routine when
in ad-hoc mode.Note: Ad-hoc mode worked intermittently before. If the driver had
previously been associated, then things were OK.Signed-off-by: Jeff Chua
Signed-off-by: Larry Finger
Cc: Stable
Signed-off-by: Greg Kroah-Hartman
26 Apr, 2011
1 commit
-
Done via perl script:
$ cat remove_semi_while.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces = qr/(\{(?:[^\{\}]++|(?-1))*\})/;foreach my $file (@ARGV) {
my $f;
my $text;
my $oldtext;next if ((-d $file));
open($f, '
Signed-off-by: Greg Kroah-Hartman
21 Apr, 2011
3 commits
-
Fixed some style and format issues with code.
Signed-off-by: Javier M. Mellid
Signed-off-by: Greg Kroah-Hartman -
Fixed some style and format issues with headers.
Signed-off-by: Javier M. Mellid
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Alexander Beregalov
Signed-off-by: Greg Kroah-Hartman
31 Mar, 2011
1 commit
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
15 Mar, 2011
1 commit
-
This patch was generated by the following semantic patch:
//
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
//Signed-off-by: Ilia Mirkin
Signed-off-by: Greg Kroah-Hartman
08 Mar, 2011
2 commits
-
Description: The original check is wrong.
Signed-off-by: Xiaochen Wang
Acked-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman -
Description:return -EFAULT if copy_to_user() fails
Signed-off-by: Xiaochen Wang
Acked-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman
01 Mar, 2011
1 commit
-
The patch below removes an extra "l" in the word.
Signed-off-by: Justin P. Mattock
Signed-off-by: Greg Kroah-Hartman
10 Feb, 2011
1 commit
-
The original code had calls to snprintf(p, 7, "wpa_ie=") but that string
is 8 characters (because snprintf() puts a NUL terminator on the end).
So instead of an '=' the what gets written to buf is a NUL terminator
followed by the rest of the string.And actually the %02x formats are three chars as well when you include
the terminator.Signed-off-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman
03 Feb, 2011
1 commit
-
This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.cSigned-off-by: Greg Kroah-Hartman
25 Jan, 2011
1 commit
-
This patch adds several new device ids to the r8712u staging driver.
The new ids were retrieved from latest vendor driver (v2.6.6.0.20101111)
downloadable from www.realtek.com.twSigned-off-by: Axel Koellhofer
Signed-off-by: Larry Finger
Cc: Stable [2.6.37]
Signed-off-by: Greg Kroah-Hartman
22 Jan, 2011
3 commits
-
* select FW_LOADER in Kconfig - From: Stefan Lippers-Hollmann
* declare MODULE_FIRMWARE for r8712u and change to correct directory
* delete 10K line farray.h containing internal firmwareSigned-off-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman
21 Jan, 2011
1 commit
-
The error path leaks the firmware struct.
Signed-off-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman
08 Dec, 2010
1 commit
-
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.Signed-off-by: Greg Kroah-Hartman
30 Nov, 2010
1 commit
18 Nov, 2010
1 commit
-
The big kernel lock has been removed from all these files at some point,
leaving only the #include.Remove this too as a cleanup.
Signed-off-by: Arnd Bergmann
Signed-off-by: Linus Torvalds
17 Nov, 2010
3 commits
-
PollingCnt is 20 and that means we loop 20 times and then run the
timeout code. After the end of the loop PollingCnt should be -1 but
because it's an unsigned char, it's actually 255 and the timeout
code never runs.Signed-off-by: Dan Carpenter
Acked-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Joe Perches
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Joe Perches
Signed-off-by: Greg Kroah-Hartman
11 Nov, 2010
1 commit
-
Signed-off-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman
10 Nov, 2010
2 commits
-
Jesper Juhl submitted a patch to remove one extraneous variable in
this file; however, there are several others.Signed-off-by: Larry Finger
Reviewed-by: Jesper Juhl
Signed-off-by: Greg Kroah-Hartman -
The variable 'pbuf' is not needed.
Signed-off-by: Jesper Juhl
Signed-off-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman
30 Oct, 2010
1 commit
-
Fixup the last remaining users of DECLARE_MUTEX and init_MUTEX.
Scripted conversion, resulting code is binary equivalent.
Signed-off-by: Thomas Gleixner
Cc: Greg Kroah-Hartman
LKML-Reference:
08 Oct, 2010
1 commit
-
Changed -objs to -y in Makefile.
Signed-off-by: Tracey Dent
Signed-off-by: Greg Kroah-Hartman
21 Sep, 2010
1 commit
-
Signed-off-by: Andy Shevchenko
Signed-off-by: Greg Kroah-Hartman
17 Sep, 2010
1 commit
-
Signed-off-by: Andy Shevchenko
Signed-off-by: Greg Kroah-Hartman
08 Sep, 2010
1 commit
-
Signed-off-by: Andy Shevchenko
Signed-off-by: Greg Kroah-Hartman
01 Sep, 2010
2 commits
-
Signed-off-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Larry Finger
Signed-off-by: Greg Kroah-Hartman