Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 5b33b85790f2..63bfc5436799 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -535,7 +535,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
                 break;
 
         default:
-                BT_ERR("Unknow packet type:%d", type);
+                BT_ERR("Unknown packet type:%d", type);
                 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, payload,
                                                 blksz * buf_block_len);
 
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 4895f0e05322..aa0919386b8c 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -214,7 +214,7 @@ static int hci_uart_send_frame(struct sk_buff *skb)
         struct hci_uart *hu;
 
         if (!hdev) {
-                BT_ERR("Frame for uknown device (hdev=NULL)");
+                BT_ERR("Frame for unknown device (hdev=NULL)");
                 return -ENODEV;
         }