dma.c mismatch between master and andy-tracking

[Andy Green]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Somebody in the thread at some point said:

| arch/arm/plat-s3c24xx/dma.c: In function 's3c2410_dma_config':
| arch/arm/plat-s3c24xx/dma.c:1049: warning: 'dcon' may be used
| uninitialized in this function

| int s3c2410_dma_config(unsigned int channel,
| 		       int xferunit)
| {
| 	struct s3c2410_dma_chan *chan = lookup_dma_channel(channel);
| 	unsigned int dcon;

Since this includes updating comments and changing the number of
parameters on an API, so I think this is something Ben is working on
rather than some rebase damage.

Ben's tree is based on the Linus tree but working ahead of it.

| I also found that the file arch/arm/plat-s3c24xx/dma.c differs quite
| alot between the two branches. I attached the output of
| git diff origin/master origin/andy-tracking --
| arch/arm/plat-s3c24xx/dma.c > plat-s3c24xx_dma.c.diff
|
| My question is, do we need a rebase or what is going on there?

After some headscratching as to why the problem only appears on my
history branches and not my working branches, I realized I hadn't synced
and pushed the master history branch only.  In fact the rest are
correctly rebased and pushed already, it's purely the public state of
master was out of date.  So I fixed that and the view should be
consistent now.

- -Andy
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkmUExgACgkQOjLpvpq7dMqtHACfcYNRbLuCGvwWSlUAt0lawDYr
e8wAnAiE5D7YSM2zADgdy5PvUUXv8iIA
=MzNT
-----END PGP SIGNATURE-----