The branch, linux has been created at 9a7ea9a4bb655f90f3fdadb8a1b6d660bf9769d8 (commit)

- Shortlog ------------------------------------------------------------ commit 9a7ea9a4bb655f90f3fdadb8a1b6d660bf9769d8 Merge: 0c46afe692ffb0a0ddb65db05a89daf568aca526 d4a00d03f8f595bd79b59e0505026480b9affded Author: Andrew Lunn andrew@lunn.ch Date: Thu Dec 31 15:59:57 2009 +0100

Merge remote branch 'origin/master' into linux

commit 0c46afe692ffb0a0ddb65db05a89daf568aca526 Merge: 851caaf8ba7f4870375dcf99bdd139faa4ac4dbc 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f Author: Andrew Lunn andrew@lunn.ch Date: Thu Dec 31 15:57:19 2009 +0100

Merge commit 'v2.6.33-rc1' into linux

Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/batman-adv/Kconfig drivers/staging/batman-adv/Makefile drivers/staging/batman-adv/README drivers/staging/batman-adv/TODO drivers/staging/batman-adv/bitarray.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/batman-adv/main.c drivers/staging/batman-adv/main.h drivers/staging/batman-adv/proc.c drivers/staging/batman-adv/routing.c drivers/staging/batman-adv/routing.h drivers/staging/batman-adv/send.c drivers/staging/batman-adv/soft-interface.c drivers/staging/batman-adv/translation-table.c drivers/staging/batman-adv/vis.c

commit 851caaf8ba7f4870375dcf99bdd139faa4ac4dbc Merge: d6fbca6445c7941b27259d2e5b345e9f722b78c1 ea765d04920173c63dbc01087d28dfa95353ba25 Author: Andrew Lunn andrew@lunn.ch Date: Thu Dec 31 15:45:49 2009 +0100

Merge remote branch 'origin/master' into linux

commit d6fbca6445c7941b27259d2e5b345e9f722b78c1 Author: Andrew Lunn andrew@lunn.ch Date: Tue Dec 8 19:15:59 2009 +0100

Add Kconfig dependancies on PROC_FS and PACKET.

Signed-off-by: Andrew Lunn andrew@lunn.ch

commit 8f3e78f979ea2a46225e95cd3bcd3b58e29cfdd4 Merge: 948be27576171c9b04202913674aa8d1d5b41dce 9274deaa5a53d6369cfb342119902f0d899662f9 Author: Andrew Lunn andrew@lunn.ch Date: Thu Dec 31 15:39:17 2009 +0100

Merge remote branch 'origin/master' into linux

Conflicts: drivers/staging/batman-adv/Makefile.kbuild

commit 948be27576171c9b04202913674aa8d1d5b41dce Author: Andrew Lunn andrew@lunn.ch Date: Sat Dec 5 11:27:17 2009 +0100

Fix the naming of the debug option in Kconfig.

commit d770813aac2248c5b498358bdb92f709c5ec87a4 Merge: 7fbccca9d7a92598e8c7c45141a1ed7f39fb5b49 8038183add3d635bd10dc9ba7091e84e9ed9ac31 Author: Andrew Lunn andrew@lunn.ch Date: Thu Dec 31 15:35:21 2009 +0100

Merge remote branch 'origin/master' into linux

Conflicts: drivers/staging/batman-adv/Makefile.kbuild

commit 7fbccca9d7a92598e8c7c45141a1ed7f39fb5b49 Author: Andrew Lunn andrew@lunn.ch Date: Mon Nov 9 20:53:14 2009 +0100

Add the batman-adv maintainers to the MAINTAINERS file.

commit 172c21f94264c00f0b9e2cd43acad26926b4c8d4 Merge: 3e86bc30dc07a110701a7188f88e7b0a661dba36 4f375745f3fa377eb3eec9b57b175716e5d7128c Author: Andrew Lunn andrew@lunn.ch Date: Thu Dec 31 15:07:52 2009 +0100

Merge remote branch 'origin/master' into linux

commit 3e86bc30dc07a110701a7188f88e7b0a661dba36 Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Nov 9 09:16:56 2009 +0800

[batman-adv] update TODO

commit 7d13dbb6ef7547d337afd97f82775e6f31fe3ff5 Merge: 47bf3b4b4f257ce716e2ef9e164a4b266ec47550 7c9abfb884b8737f0afdc8a88bcea77526f0da87 Author: Andrew Lunn andrew@lunn.ch Date: Thu Dec 31 14:55:25 2009 +0100

Merge remote branch 'torvalds/master'; commit 'v2.6.32-rc6' into linux

commit 47bf3b4b4f257ce716e2ef9e164a4b266ec47550 Author: Andrew Lunn lunn@lunn.ch Date: Sun Nov 8 19:17:04 2009 +0100

Remove Makefile.kbuild which is not used for in kernel builds.

commit e1de373f1ce1b70b46857249f5bbd48df4fe72a3 Merge: 4d8be7927cad4c588a41bb5ae28b15542cd95eb4 b51e5362ca7ebf77a417217136691c63ce94f794 Author: Andrew Lunn andrew@lunn.ch Date: Thu Dec 31 14:31:57 2009 +0100

Merge remote branch 'origin/master' into linux

commit 4d8be7927cad4c588a41bb5ae28b15542cd95eb4 Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Oct 18 00:04:31 2009 +0800

batman-adv: move TODO into the batman-adv folder

commit d3e57fbb7e69bbd1a995c9da63e5ce9b2e174b07 Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Oct 18 00:00:34 2009 +0800

batman-adv: initial TODO file added

commit 8c3eed6e8951cdda34f4c9063501febf7cccdf33 Author: Andrew Lunn andrew@lunn.ch Date: Sun Oct 18 12:44:49 2009 +0200

Add missing Kconfig file, without which we cannot build in tree.

commit b9deff8de210304f9bbae06789b768d832d0a1c4 Author: Andrew Lunn andrew@lunn.ch Date: Fri Oct 16 23:21:25 2009 +0200

Allow batman-adv to be build inside staging.

commit d67bce0f16ca240abe5b11460ea91d64792a45ea Author: Andrew Lunn andrew@lunn.ch Date: Fri Oct 16 23:16:11 2009 +0200

Allow staging drivers to be used with UML.

commit 64e9e692b8a092fe868570a492a26fe3de8b4c38 Author: Andrew Lunn andrew@lunn.ch Date: Fri Oct 16 23:14:37 2009 +0200

UML register interrupt race condition fix.

uml_request_irq enables the interrupt before registering an interrupt handler. This causes trouble when an interrupt occurs between enabling the interrupt and before registering the handler. The interrupts remains perminently disabled...

Also, change the way interrupts return. With older Linux kernels, __do_IRQ would call all chained interrupt handlers. Now it only calls handlers until one returns a value indicating it has handled the interrupt. We need to ensure all UML network interrupt handlers get called, so don't return a value indicating we have handled the interrupt.

commit 1612b6352e3517ecebbf2715b8e79fe3e3182a7e Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Oct 18 00:04:31 2009 +0800

batman-adv: move TODO into the batman-adv folder

commit 0c4e20f6426463e3d686180de535cec2fec227ac Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Oct 18 00:00:34 2009 +0800

batman-adv: initial TODO file added

commit 4f293b4d98bb8205f320472e4d60453cab9ff3f1 Author: Marek Lindner lindner_marek@yahoo.de Date: Thu Dec 31 14:11:43 2009 +0100

Add batman-adv to torvalds linux 2.6 tree

-----------------------------------------------------------------------