Merge branch 'master' into for-linus

This commit is contained in:
Russell King 2009-09-22 20:54:53 +01:00
commit ae19ffbadc
2706 changed files with 356734 additions and 236733 deletions

View file

@ -9,7 +9,7 @@
*
* Modifications from:
* CIH <cih@coventive.com>
* Nicolas Pitre <nico@cam.org>
* Nicolas Pitre <nico@fluxnic.net>
* Andrew Christian <andrew.christian@hp.com>
*
* Converted to the RTC subsystem and Driver Model