Merge branch 'origin' into kconfig-for-1.3.1
authorGrant Likely <grant.likely@secretlab.ca>
Sat, 17 Nov 2007 04:01:19 +0000 (21:01 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Sat, 17 Nov 2007 04:01:19 +0000 (21:01 -0700)
commitefe33035acd5f7c13963a4d52e5aac1b68612ae4
tree37d6ccca1c82953ae4c41451cb3ec5fe53e2dc3c
parent4d4faae65e115e327425cd514c1a35146a85166b
parent5947f6999aafa7c54c1390983d264a8463dfea8e
Merge branch 'origin' into kconfig-for-1.3.1

Conflicts:

drivers/Makefile
drivers/Makefile