kaspter

diff -urN strace-4.6.old/defs.h strace-4.6.new/defs.h
--- strace-4.6.old/defs.h	2011-03-15 20:19:09.000000000 +0300
+++ strace-4.6.new/defs.h	2011-10-05 01:06:42.000000000 +0400
@@ -594,6 +594,7 @@
 extern int rtc_ioctl(struct tcb *, long, long);
 extern int scsi_ioctl(struct tcb *, long, long);
 extern int block_ioctl(struct tcb *, long, long);
+extern int v4l2_ioctl(struct tcb *, long, long);
 #endif
 

kaspter

$ git branch 
  master
* snonk
$ git rev-parse master snonk
1333053e19b35008e74476b1549ecfed709c3d44
1333053e19b35008e74476b1549ecfed709c3d44
$ git name-rev --name-only HEAD
master
$ git rev-parse --symbolic-full-name --abbrev-ref HEAD
snonk

kaspter

#!/bin/bash
#
# DESCRIPTION:
#
#   Set the bash prompt according to:
#    * the branch/status of the current git repository
#    * the branch of the current subversion repository
#    * the return value of the previous command
# 
# USAGE:

kaspter

#!/usr/bin/env python2.6

# Copyright (c) 2010, Code Aurora Forum. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#    # Redistributions of source code must retain the above copyright
#       notice, this list of conditions and the following disclaimer.
#    # Redistributions in binary form must reproduce the above

kaspter

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 05f1105..b18990a 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -81,6 +81,13 @@ config ANDROID_INTF_ALARM_DEV
 	  elapsed realtime, and a non-wakeup alarm on the monotonic clock.
 	  Also exports the alarm interface to user-space.
 
+config ANDROID_PM
+	bool "Android PM support"

kaspter

#!/bin/sh

# Recursively add a .gitignore file to all directories 
# in the working directory which are empty and don't
# start with a dot.  Helpful for tracking empty dirs
# in a git repository.

for i in $(find . -type d -regex ``./[^.].*'' -empty); do touch $i"/.gitignore"; done;