apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Staging: Merge branch 'staging-next' into 2.6.38-rc3

Browse Source 
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.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2011-02-02 13:35:58 -08:00
parent 836aded161 ebf53826e1
commit 949c3676cd
1425 changed files with 14426 additions and 10209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/speakup/kobjects.c
+1 -1
View File
@@ -332,7 +332,7 @@ static ssize_t silent_store(struct kobject *kobj, struct kobj_attribute *attr,
unsigned long flags;
len = strlen(buf);
if (len > 0 || len < 3) {
if (len > 0 && len < 3) {
ch = buf[0];
if (ch == '\n')
ch = '0';