Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Fix typos in drivers/isdn/hisax/isdnl2.c
  Fix typos in doc and comments
  BUG_ON conversion for fs/aio.c
  BUG_ON conversion for drivers/mmc/omap.c
  BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
  Fix misc .c/.h comment typos
  Fix misc Kconfig typos
  Fix typos in /Documentation : Misc
  Fix typos in /Documentation : 'U-Z'
  Fix typos in /Documentation : 'T''
  Fix jiffies.h comment
  tabify MAINTAINERS
  fix spelling error in include/linux/kernel.h
  mqueue.h: don't include linux/types.h

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index 6d043172555..cd3b5ad5349 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -1442,7 +1442,7 @@ l2_tei_remove(struct FsmInst *fi, int event, void *arg)
 }
 
 static void
-l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st14_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
         struct PStack *st = fi->userdata;
         
@@ -1453,7 +1453,7 @@ l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 
 static void
-l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st5_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
         struct PStack *st = fi->userdata;
 
@@ -1466,7 +1466,7 @@ l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 
 static void
-l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st6_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
         struct PStack *st = fi->userdata;
 
@@ -1477,7 +1477,7 @@ l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 
 static void
-l2_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
         struct PStack *st = fi->userdata;
 
@@ -1612,14 +1612,14 @@ static struct FsmNode L2FnList[] __initdata =
         {ST_L2_6, EV_L2_FRAME_ERROR, l2_frame_error},
         {ST_L2_7, EV_L2_FRAME_ERROR, l2_frame_error_reest},
         {ST_L2_8, EV_L2_FRAME_ERROR, l2_frame_error_reest},
-        {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistant_da},
+        {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistent_da},
         {ST_L2_2, EV_L1_DEACTIVATE, l2_st24_tei_remove},
         {ST_L2_3, EV_L1_DEACTIVATE, l2_st3_tei_remove},
-        {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistant_da},
-        {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistant_da},
-        {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistant_da},
-        {ST_L2_7, EV_L1_DEACTIVATE, l2_persistant_da},
-        {ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da},
+        {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistent_da},
+        {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistent_da},
+        {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistent_da},
+        {ST_L2_7, EV_L1_DEACTIVATE, l2_persistent_da},
+        {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da},
 };
 
 #define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode))