diff --git a/[refs] b/[refs]
index bb533a30e038..2ab0ec4c9abc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52c02fcd00cf6fb6f5b2c8beae3b283c63cf1210
+refs/heads/master: b228ede44c1cded7f3dadbb8bfaeaec97f7885e8
diff --git a/trunk/Documentation/video4linux/API.html b/trunk/Documentation/video4linux/API.html
index 441407b12a9f..afbe9ae7ee96 100644
--- a/trunk/Documentation/video4linux/API.html
+++ b/trunk/Documentation/video4linux/API.html
@@ -8,7 +8,7 @@ <H1>Video For Linux APIs</H1>
 </td><td>
 Obsoleted by V4L2 API
 </td></tr><tr><td>
-<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API.html>
+<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API>
 V4L2 API</a>
 </td><td>
 Should be used for new projects
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index fce18638134a..735b62b3c08e 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -369,7 +369,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 			/* If chip is not tda8290, don't register.
 			   since it can be tda9887*/
 			if (tda8290_probe(&t->i2c) != 0) {
-		        	tuner_dbg("chip at addr %x is not a tda8290\n", addr);
+				tuner_dbg("chip at addr %x is not a tda8290\n", addr);
 				kfree(t);
 				return 0;
 			}