ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/uwb/lc-rc.c b/drivers/uwb/lc-rc.c
index b0091c771b9a..b4395f41a007 100644
--- a/drivers/uwb/lc-rc.c
+++ b/drivers/uwb/lc-rc.c
@@ -168,7 +168,7 @@ int uwb_rc_mac_addr_setup(struct uwb_rc *rc)
         }
 
         if (uwb_mac_addr_unset(&addr) || uwb_mac_addr_bcast(&addr)) {
-                addr.data[0] = 0x02; /* locally adminstered and unicast */
+                addr.data[0] = 0x02; /* locally administered and unicast */
                 get_random_bytes(&addr.data[1], sizeof(addr.data)-1);
 
                 result = uwb_rc_mac_addr_set(rc, &addr);