Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

arch/ppc64/kernel/signal32.c

@@ -478,7 +478,7 @@ static long copy_siginfo_to_user32(compat_siginfo_t __user *d, siginfo_t *s)
 	case __SI_TIMER >> 16:
 		err |= __put_user(s->si_tid, &d->si_tid);
 		err |= __put_user(s->si_overrun, &d->si_overrun);
-		err |= __put_user((u32)(u64)s->si_ptr, &d->si_ptr);
+		err |= __put_user(s->si_int, &d->si_int);
 		break;
 	case __SI_RT >> 16: /* This is not generated by the kernel as of now.  */
 	case __SI_MESGQ >> 16:

drivers/media/video/bttv-risc.c

@@ -125,6 +125,7 @@ bttv_risc_planar(struct bttv *btv, struct btcx_riscmem *risc,
 	struct scatterlist *ysg;
 	struct scatterlist *usg;
 	struct scatterlist *vsg;
+	int topfield = (0 == yoffset);
 	int rc;
 
 	/* estimate risc mem: worst case is one write per page border +
@@ -153,13 +154,13 @@ bttv_risc_planar(struct bttv *btv, struct btcx_riscmem *risc,
 			chroma = 1;
 			break;
 		case 1:
-			if (!yoffset)
+			if (topfield)
 				chroma = (line & 1) == 0;
 			else
 				chroma = (line & 1) == 1;
 			break;
 		case 2:
-			if (!yoffset)
+			if (topfield)
 				chroma = (line & 3) == 0;
 			else
 				chroma = (line & 3) == 2;