Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
Documentation/feature-removal-schedule.txt between commit
9bfd67f96a92f8853e77e028acfa93e737ffe2ad ("HID: add compat support") from
the hid tree and commit 4895f0191a229a864c701c5f38a967fbdd15a0e0
("mcfserial-goes-byebye") from the ttydev tree.

Just an overlapping add/remove.  I fixed it up (see below) and can carry
it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc Documentation/feature-removal-schedule.txt
index 81fc817,7781bf8..0000000

--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt

@@@ -265,22 -265,7 +265,14 @@@ Why:	replaced by allowdac and no dac co
  Who:	Glauber Costa [off-list ref]
  
  ---------------------------
- 
- What:	old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE)
- When:	2.6.28
- Why:	This driver still uses the old interface and has been replaced
- 	by CONFIG_SERIAL_MCF.
- Who:	Sebastian Siewior [off-list ref]
- 
- ---------------------------
  
 +What:	remove HID compat support
 +When:	2.6.29
 +Why:	needed only as a temporary solution until distros fix themselves up
 +Who:	Jiri Slaby [off-list ref]
 +
 +---------------------------
 +
  What:	/sys/o2cb symlink
  When:	January 2010
  Why:	/sys/fs/o2cb is the proper location for this information - /sys/o2cb