diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 10:58:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 10:58:25 -0800 |
| commit | b91867f2ee5c84b550f95ce54c91b180f70f48cb (patch) | |
| tree | bd7a5be4484d539af13e6b345320455e989612cf /drivers/staging/android/binder.c | |
| parent | Merge tag 'staging-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging (diff) | |
| parent | staging: sep: reworked crypto layer (diff) | |
| download | linux-dev-b91867f2ee5c84b550f95ce54c91b180f70f48cb.tar.xz linux-dev-b91867f2ee5c84b550f95ce54c91b180f70f48cb.zip | |
Merge tag 'staging-3.3-rc3' into staging-next
This was done to resolve some merge issues with the following files that
had changed in both branches:
drivers/staging/rtl8712/rtl871x_sta_mgt.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/staging/zcache/zcache-main.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/binder.c')
| -rw-r--r-- | drivers/staging/android/binder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index f0b7e6605ab5..094e18c495c5 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -258,7 +258,7 @@ struct binder_ref { }; struct binder_buffer { - struct list_head entry; /* free and allocated entries by addesss */ + struct list_head entry; /* free and allocated entries by address */ struct rb_node rb_node; /* free entry by size or allocated entry */ /* by address */ unsigned free:1; |