| commit | 22b0dc908a191a2b7f6e642206ff9e34f98f5ffd | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Mon Oct 01 22:55:26 2012 -0700 |
| committer | Tejun Heo <tj@kernel.org> | Mon Oct 01 22:55:26 2012 -0700 |
| tree | d2555c3b7cf310a0d0778f8c358efcb6a7e6bb78 | |
| parent | 974a847e00cf3ff1695e62b276892137893706ab [diff] | |
| parent | 7c6e72e46c9ea4a88f3f8ba96edce9db4bd48726 [diff] |
Merge branch 'for-3.7' into tmp Conflicts: drivers/hid/hid-picolcd.c drivers/isdn/mISDN/hwchannel.c drivers/tty/serial/omap-serial.c