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

Merge 3.10-rc3 into staging-next

Browse Source 
We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2013-05-27 10:54:33 +09:00
parent 42b4212baa e4aa937ec7
commit 829455bb0e
839 changed files with 9106 additions and 5745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/nvec/nvec.c
+1 -1
View File
@@ -199,7 +199,7 @@ static struct nvec_msg *nvec_msg_alloc(struct nvec_chip *nvec,
*
* Free the given message
*/
inline void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg)
void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg)
{
if (msg != &nvec->tx_scratch)
dev_vdbg(nvec->dev, "INFO: Free %ti\n", msg - nvec->msg_pool);