Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 2 insertions, 2 deletions

diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index cafe9f54d841..9ac0497decb8 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -78,7 +78,7 @@ static struct bnep_session *__bnep_get_session(u8 *dst)
 static void __bnep_link_session(struct bnep_session *s)
 {
         /* It's safe to call __module_get() here because sessions are added
-           by the socket layer which has to hold the refference to this module.
+           by the socket layer which has to hold the reference to this module.
          */
         __module_get(THIS_MODULE);
         list_add(&s->list, &bnep_session_list);
@@ -629,7 +629,7 @@ int bnep_del_connection(struct bnep_conndel_req *req)
         s = __bnep_get_session(req->dst);
         if (s) {
                 /* Wakeup user-space which is polling for socket errors.
-                 * This is temporary hack untill we have shutdown in L2CAP */
+                 * This is temporary hack until we have shutdown in L2CAP */
                 s->sock->sk->sk_err = EUNATCH;
 
                 /* Kill session thread */