Merge branch 'Linux 3.0.21' into msm-3.0
Merge Upstream's stable 3.0.21 branch into msm-3.0 This consists 814 commits and some merge conflicts. The merge conflicts are because of some local changes to msm-3.0 as well as some conflicts between google's tree and the upstream tree. Conflicts: arch/arm/kernel/head.S drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c drivers/mmc/core/core.c drivers/tty/serial/serial_core.c drivers/usb/host/ehci-hub.c drivers/usb/serial/qcserial.c fs/namespace.c fs/proc/base.c Change-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21 Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
This commit is contained in:
@@ -1355,7 +1355,7 @@ static ssize_t binary_sysctl(const int *name, int nlen,
|
||||
|
||||
fput(file);
|
||||
out_putname:
|
||||
putname(pathname);
|
||||
__putname(pathname);
|
||||
out:
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user